From e5d8ab8a0c2fefdc262c98c2d6d3797a3a6cbd3e Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Sun, 27 Feb 2005 23:12:25 +0000 Subject: [PATCH] patch from Ian Abbott : The last change to das08_cs.c on Feb 5 breaks on 2.4, though the change itself was not unreasonable (it saves a few bytes at least). The problem is that the change was incompatible with the version of struct device_driver defined in comedi's linux/device.h compatibility header. In the "real" version of struct device_driver, the "name" member is a "char *", but in the compatibility version it's a "dev_info_t", which is a "char[32]". The attached patch sorts it out in the compatibility headers. --- include/linux/device.h | 2 +- include/pcmcia/ds.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/device.h b/include/linux/device.h index f3a6d18f..7f3bf34e 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -12,7 +12,7 @@ struct device_driver { - dev_info_t name; + char *name; }; typedef void class_simple; diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index 31d7ef93..cf8223e5 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h @@ -20,12 +20,13 @@ 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((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) -- 2.26.2