aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/cy82c693.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:41 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:41 -0400
commita9ab09e26055a76295548ca36ec00de2f4367d32 (patch)
tree51f1c279e74e3d5b3ec920b33fae579339dd67ad /drivers/ide/pci/cy82c693.c
parentd6ff9f64e68d23feab44efa07cc6aee01f3ef32b (diff)
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>
Diffstat (limited to 'drivers/ide/pci/cy82c693.c')
-rw-r--r--drivers/ide/pci/cy82c693.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index e5f8fc0ed318..5297f07d2933 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -331,7 +331,7 @@ static const struct pci_device_id cy82c693_pci_tbl[] = {
331}; 331};
332MODULE_DEVICE_TABLE(pci, cy82c693_pci_tbl); 332MODULE_DEVICE_TABLE(pci, cy82c693_pci_tbl);
333 333
334static struct pci_driver driver = { 334static struct pci_driver cy82c693_pci_driver = {
335 .name = "Cypress_IDE", 335 .name = "Cypress_IDE",
336 .id_table = cy82c693_pci_tbl, 336 .id_table = cy82c693_pci_tbl,
337 .probe = cy82c693_init_one, 337 .probe = cy82c693_init_one,
@@ -342,12 +342,12 @@ static struct pci_driver driver = {
342 342
343static int __init cy82c693_ide_init(void) 343static int __init cy82c693_ide_init(void)
344{ 344{
345 return ide_pci_register_driver(&driver); 345 return ide_pci_register_driver(&cy82c693_pci_driver);
346} 346}
347 347
348static void __exit cy82c693_ide_exit(void) 348static void __exit cy82c693_ide_exit(void)
349{ 349{
350 pci_unregister_driver(&driver); 350 pci_unregister_driver(&cy82c693_pci_driver);
351} 351}
352 352
353module_init(cy82c693_ide_init); 353module_init(cy82c693_ide_init);