commit a9ab09e26055a76295548ca36ec00de2f4367d32
author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Mon Oct 13 21:39:41 2008 +0200
committer Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Mon Oct 13 21:39:41 2008 +0200
tree 51f1c279e74e3d5b3ec920b33fae579339dd67ad
parent d6ff9f64e68d23feab44efa07cc6aee01f3ef32b

ide: use unique names for struct pci_driver instances

Noticed-by: Russell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/pci/aec62xx.c

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index c294b19..4142c69 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -302,7 +302,7 @@
 };
 MODULE_DEVICE_TABLE(pci, aec62xx_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver aec62xx_pci_driver = {
 	.name		= "AEC62xx_IDE",
 	.id_table	= aec62xx_pci_tbl,
 	.probe		= aec62xx_init_one,
@@ -313,12 +313,12 @@
 
 static int __init aec62xx_ide_init(void)
 {
-	return ide_pci_register_driver(&driver);
+	return ide_pci_register_driver(&aec62xx_pci_driver);
 }
 
 static void __exit aec62xx_ide_exit(void)
 {
-	pci_unregister_driver(&driver);
+	pci_unregister_driver(&aec62xx_pci_driver);
 }
 
 module_init(aec62xx_ide_init);