From: Ian Abbott <abbotti@mev.co.uk>
Date: Wed, 22 Oct 2008 16:24:33 +0000 (+0000)
Subject: Renamed comedi_driver##_pci to comedi_driver##_pci_driver to avoid
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ed5f347d9980d3738b6ea4f05ecbd653d0ac595;p=comedi.git

Renamed comedi_driver##_pci to comedi_driver##_pci_driver to avoid
section mismatch warnings.
---

diff --git a/include/linux/comedidev.h b/include/linux/comedidev.h
index 11737a27..c2fbf3db 100644
--- a/include/linux/comedidev.h
+++ b/include/linux/comedidev.h
@@ -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, \
@@ -93,12 +93,12 @@
 		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); \