From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Tue, 1 Jun 2004 01:55:51 +0000 (+0000)
Subject: fix compiler warnings for 2.4
X-Git-Tag: r0_7_69~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8aa7c237fb0c5f4e86288c7ef8050bcbb47fd123;p=comedi.git

fix compiler warnings for 2.4
---

diff --git a/include/linux/device.h b/include/linux/device.h
index 3631fd51..75f5bb73 100644
--- 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 1be7299e..31d7ef93 100644
--- 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)