fix compiler warnings for 2.4

diff --git a/include/linux/device.h b/include/linux/device.h
index 3631fd514b5e60bc067e39d4964b83bc5ab826f8..75f5bb73c4cf8f79b73137bed9189c954ef3eb6b 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -8,9 +8,11 @@
 #include <linux/version.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <pcmcia/cs_types.h>
+
 struct device_driver 
 {
-       char                    * name;
+       dev_info_t name;
 };
 #else
 #include_next <linux/device.h>

diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 1be7299eae7c85039266762f730f75a788eb4e3e..31d7ef9322afac20a2a9a3093c6f9acb3cfec5e0 100644 (file)
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -20,12 +20,12 @@ struct pcmcia_driver {
 /* driver registration */
 static inline int pcmcia_register_driver(struct pcmcia_driver *driver)
 {
-       return register_pccard_driver(driver->drv.name, driver->attach, driver->detach);
+       return register_pccard_driver(&driver->drv.name, driver->attach, driver->detach);
 };
 
 static void inline pcmcia_unregister_driver(struct pcmcia_driver *driver)
 {
-       unregister_pccard_driver(driver->drv.name);
+       unregister_pccard_driver(&driver->drv.name);
 };
 
 static void inline cs_error(client_handle_t handle, int func, int ret)