aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/ns87415.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/ns87415.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/ns87415.c')
-rw-r--r--drivers/ide/pci/ns87415.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index 61a143661ee0..13789060f407 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -339,7 +339,7 @@ static const struct pci_device_id ns87415_pci_tbl[] = {
339}; 339};
340MODULE_DEVICE_TABLE(pci, ns87415_pci_tbl); 340MODULE_DEVICE_TABLE(pci, ns87415_pci_tbl);
341 341
342static struct pci_driver driver = { 342static struct pci_driver ns87415_pci_driver = {
343 .name = "NS87415_IDE", 343 .name = "NS87415_IDE",
344 .id_table = ns87415_pci_tbl, 344 .id_table = ns87415_pci_tbl,
345 .probe = ns87415_init_one, 345 .probe = ns87415_init_one,
@@ -350,12 +350,12 @@ static struct pci_driver driver = {
350 350
351static int __init ns87415_ide_init(void) 351static int __init ns87415_ide_init(void)
352{ 352{
353 return ide_pci_register_driver(&driver); 353 return ide_pci_register_driver(&ns87415_pci_driver);
354} 354}
355 355
356static void __exit ns87415_ide_exit(void) 356static void __exit ns87415_ide_exit(void)
357{ 357{
358 pci_unregister_driver(&driver); 358 pci_unregister_driver(&ns87415_pci_driver);
359} 359}
360 360
361module_init(ns87415_ide_init); 361module_init(ns87415_ide_init);