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/sl82c105.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/sl82c105.c')
-rw-r--r-- | drivers/ide/pci/sl82c105.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index 37a6b7bdc040..4399e76aa081 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c | |||
@@ -345,7 +345,7 @@ static const struct pci_device_id sl82c105_pci_tbl[] = { | |||
345 | }; | 345 | }; |
346 | MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl); | 346 | MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl); |
347 | 347 | ||
348 | static struct pci_driver driver = { | 348 | static struct pci_driver sl82c105_pci_driver = { |
349 | .name = "W82C105_IDE", | 349 | .name = "W82C105_IDE", |
350 | .id_table = sl82c105_pci_tbl, | 350 | .id_table = sl82c105_pci_tbl, |
351 | .probe = sl82c105_init_one, | 351 | .probe = sl82c105_init_one, |
@@ -356,12 +356,12 @@ static struct pci_driver driver = { | |||
356 | 356 | ||
357 | static int __init sl82c105_ide_init(void) | 357 | static int __init sl82c105_ide_init(void) |
358 | { | 358 | { |
359 | return ide_pci_register_driver(&driver); | 359 | return ide_pci_register_driver(&sl82c105_pci_driver); |
360 | } | 360 | } |
361 | 361 | ||
362 | static void __exit sl82c105_ide_exit(void) | 362 | static void __exit sl82c105_ide_exit(void) |
363 | { | 363 | { |
364 | pci_unregister_driver(&driver); | 364 | pci_unregister_driver(&sl82c105_pci_driver); |
365 | } | 365 | } |
366 | 366 | ||
367 | module_init(sl82c105_ide_init); | 367 | module_init(sl82c105_ide_init); |