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/delkin_cb.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/delkin_cb.c')
-rw-r--r-- | drivers/ide/pci/delkin_cb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c index 83b63b365e51..8689a706f537 100644 --- a/drivers/ide/pci/delkin_cb.c +++ b/drivers/ide/pci/delkin_cb.c | |||
@@ -117,7 +117,7 @@ static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = { | |||
117 | }; | 117 | }; |
118 | MODULE_DEVICE_TABLE(pci, delkin_cb_pci_tbl); | 118 | MODULE_DEVICE_TABLE(pci, delkin_cb_pci_tbl); |
119 | 119 | ||
120 | static struct pci_driver driver = { | 120 | static struct pci_driver delkin_cb_pci_driver = { |
121 | .name = "Delkin-ASKA-Workbit Cardbus IDE", | 121 | .name = "Delkin-ASKA-Workbit Cardbus IDE", |
122 | .id_table = delkin_cb_pci_tbl, | 122 | .id_table = delkin_cb_pci_tbl, |
123 | .probe = delkin_cb_probe, | 123 | .probe = delkin_cb_probe, |
@@ -126,12 +126,12 @@ static struct pci_driver driver = { | |||
126 | 126 | ||
127 | static int __init delkin_cb_init(void) | 127 | static int __init delkin_cb_init(void) |
128 | { | 128 | { |
129 | return pci_register_driver(&driver); | 129 | return pci_register_driver(&delkin_cb_pci_driver); |
130 | } | 130 | } |
131 | 131 | ||
132 | static void __exit delkin_cb_exit(void) | 132 | static void __exit delkin_cb_exit(void) |
133 | { | 133 | { |
134 | pci_unregister_driver(&driver); | 134 | pci_unregister_driver(&delkin_cb_pci_driver); |
135 | } | 135 | } |
136 | 136 | ||
137 | module_init(delkin_cb_init); | 137 | module_init(delkin_cb_init); |