diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 15:39:41 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 15:39:41 -0400 |
commit | a9ab09e26055a76295548ca36ec00de2f4367d32 (patch) | |
tree | 51f1c279e74e3d5b3ec920b33fae579339dd67ad /drivers/ide/pci/rz1000.c | |
parent | d6ff9f64e68d23feab44efa07cc6aee01f3ef32b (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/rz1000.c')
-rw-r--r-- | drivers/ide/pci/rz1000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c index c117a068761b..7daf0135cbac 100644 --- a/drivers/ide/pci/rz1000.c +++ b/drivers/ide/pci/rz1000.c | |||
@@ -59,7 +59,7 @@ static const struct pci_device_id rz1000_pci_tbl[] = { | |||
59 | }; | 59 | }; |
60 | MODULE_DEVICE_TABLE(pci, rz1000_pci_tbl); | 60 | MODULE_DEVICE_TABLE(pci, rz1000_pci_tbl); |
61 | 61 | ||
62 | static struct pci_driver driver = { | 62 | static struct pci_driver rz1000_pci_driver = { |
63 | .name = "RZ1000_IDE", | 63 | .name = "RZ1000_IDE", |
64 | .id_table = rz1000_pci_tbl, | 64 | .id_table = rz1000_pci_tbl, |
65 | .probe = rz1000_init_one, | 65 | .probe = rz1000_init_one, |
@@ -68,12 +68,12 @@ static struct pci_driver driver = { | |||
68 | 68 | ||
69 | static int __init rz1000_ide_init(void) | 69 | static int __init rz1000_ide_init(void) |
70 | { | 70 | { |
71 | return ide_pci_register_driver(&driver); | 71 | return ide_pci_register_driver(&rz1000_pci_driver); |
72 | } | 72 | } |
73 | 73 | ||
74 | static void __exit rz1000_ide_exit(void) | 74 | static void __exit rz1000_ide_exit(void) |
75 | { | 75 | { |
76 | pci_unregister_driver(&driver); | 76 | pci_unregister_driver(&rz1000_pci_driver); |
77 | } | 77 | } |
78 | 78 | ||
79 | module_init(rz1000_ide_init); | 79 | module_init(rz1000_ide_init); |