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

diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index d6341f7..5efb467 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -145,7 +145,7 @@
 };
 MODULE_DEVICE_TABLE(pci, cs5520_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver cs5520_pci_driver = {
 	.name		= "Cyrix_IDE",
 	.id_table	= cs5520_pci_tbl,
 	.probe		= cs5520_init_one,
@@ -155,7 +155,7 @@
 
 static int __init cs5520_ide_init(void)
 {
-	return ide_pci_register_driver(&driver);
+	return ide_pci_register_driver(&cs5520_pci_driver);
 }
 
 module_init(cs5520_ide_init);