Renamed comedi_driver##_pci to comedi_driver##_pci_driver to avoid
authorIan Abbott <abbotti@mev.co.uk>
Wed, 22 Oct 2008 16:24:33 +0000 (16:24 +0000)
committerIan Abbott <abbotti@mev.co.uk>
Wed, 22 Oct 2008 16:24:33 +0000 (16:24 +0000)
section mismatch warnings.

include/linux/comedidev.h

index 11737a27b8aee1f32830e4c2ff95f283d560c810..c2fbf3dbc18c4417c39afbcd8b211b9edad0baaa 100644 (file)
@@ -82,7 +82,7 @@
        { \
                comedi_pci_auto_unconfig(dev); \
        } \
-       static struct pci_driver comedi_driver ## _pci = \
+       static struct pci_driver comedi_driver ## _pci_driver = \
        { \
                .id_table = pci_id_table, \
                .probe = & comedi_driver ## _pci_probe, \
                int retval; \
                retval = comedi_driver_register(& comedi_driver); \
                if(retval < 0) return retval; \
-               comedi_driver ## _pci.name = (char*)comedi_driver.driver_name; \
-               return pci_register_driver(& comedi_driver ## _pci); \
+               comedi_driver ## _pci_driver.name = (char*)comedi_driver.driver_name; \
+               return pci_register_driver(& comedi_driver ## _pci_driver); \
        } \
        static void __exit comedi_driver ## _cleanup_module(void) \
        { \
-               pci_unregister_driver(& comedi_driver ## _pci); \
+               pci_unregister_driver(& comedi_driver ## _pci_driver); \
                comedi_driver_unregister(& comedi_driver); \
        } \
        module_init(comedi_driver ## _init_module); \