Index: include/linux/device.h
===================================================================
RCS file: /var/cvs/comedi/include/linux/device.h,v
retrieving revision 1.3
diff -u -r1.3 device.h
--- include/linux/device.h	29 Dec 2004 03:10:46 -0000	1.3
+++ include/linux/device.h	25 Feb 2005 16:46:04 -0000
@@ -12,7 +12,7 @@
 
 struct device_driver 
 {
-	dev_info_t name;
+	char *name;
 };
 
 typedef void class_simple;
Index: include/pcmcia/ds.h
===================================================================
RCS file: /var/cvs/comedi/include/pcmcia/ds.h,v
retrieving revision 1.3
diff -u -r1.3 ds.h
--- include/pcmcia/ds.h	1 Jun 2004 01:55:52 -0000	1.3
+++ include/pcmcia/ds.h	25 Feb 2005 16:46:04 -0000
@@ -20,12 +20,13 @@
 /* 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((dev_info_t*)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((dev_info_t*)driver->drv.name);
 };
 
 static void inline cs_error(client_handle_t handle, int func, int ret)