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/opti621.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/opti621.c')
-rw-r--r-- | drivers/ide/pci/opti621.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c index f0db38bd70e3..6048eda3cd61 100644 --- a/drivers/ide/pci/opti621.c +++ b/drivers/ide/pci/opti621.c | |||
@@ -220,7 +220,7 @@ static const struct pci_device_id opti621_pci_tbl[] = { | |||
220 | }; | 220 | }; |
221 | MODULE_DEVICE_TABLE(pci, opti621_pci_tbl); | 221 | MODULE_DEVICE_TABLE(pci, opti621_pci_tbl); |
222 | 222 | ||
223 | static struct pci_driver driver = { | 223 | static struct pci_driver opti621_pci_driver = { |
224 | .name = "Opti621_IDE", | 224 | .name = "Opti621_IDE", |
225 | .id_table = opti621_pci_tbl, | 225 | .id_table = opti621_pci_tbl, |
226 | .probe = opti621_init_one, | 226 | .probe = opti621_init_one, |
@@ -231,12 +231,12 @@ static struct pci_driver driver = { | |||
231 | 231 | ||
232 | static int __init opti621_ide_init(void) | 232 | static int __init opti621_ide_init(void) |
233 | { | 233 | { |
234 | return ide_pci_register_driver(&driver); | 234 | return ide_pci_register_driver(&opti621_pci_driver); |
235 | } | 235 | } |
236 | 236 | ||
237 | static void __exit opti621_ide_exit(void) | 237 | static void __exit opti621_ide_exit(void) |
238 | { | 238 | { |
239 | pci_unregister_driver(&driver); | 239 | pci_unregister_driver(&opti621_pci_driver); |
240 | } | 240 | } |
241 | 241 | ||
242 | module_init(opti621_ide_init); | 242 | module_init(opti621_ide_init); |