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/cy82c693.c

diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index e5f8fc0..5297f07 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -331,7 +331,7 @@
 };
 MODULE_DEVICE_TABLE(pci, cy82c693_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver cy82c693_pci_driver = {
 	.name		= "Cypress_IDE",
 	.id_table	= cy82c693_pci_tbl,
 	.probe		= cy82c693_init_one,
@@ -342,12 +342,12 @@
 
 static int __init cy82c693_ide_init(void)
 {
-	return ide_pci_register_driver(&driver);
+	return ide_pci_register_driver(&cy82c693_pci_driver);
 }
 
 static void __exit cy82c693_ide_exit(void)
 {
-	pci_unregister_driver(&driver);
+	pci_unregister_driver(&cy82c693_pci_driver);
 }
 
 module_init(cy82c693_ide_init);