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/piix.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/piix.c')
-rw-r--r-- | drivers/ide/pci/piix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c index a06c03f8e295..a909684ee61b 100644 --- a/drivers/ide/pci/piix.c +++ b/drivers/ide/pci/piix.c | |||
@@ -444,7 +444,7 @@ static const struct pci_device_id piix_pci_tbl[] = { | |||
444 | }; | 444 | }; |
445 | MODULE_DEVICE_TABLE(pci, piix_pci_tbl); | 445 | MODULE_DEVICE_TABLE(pci, piix_pci_tbl); |
446 | 446 | ||
447 | static struct pci_driver driver = { | 447 | static struct pci_driver piix_pci_driver = { |
448 | .name = "PIIX_IDE", | 448 | .name = "PIIX_IDE", |
449 | .id_table = piix_pci_tbl, | 449 | .id_table = piix_pci_tbl, |
450 | .probe = piix_init_one, | 450 | .probe = piix_init_one, |
@@ -456,12 +456,12 @@ static struct pci_driver driver = { | |||
456 | static int __init piix_ide_init(void) | 456 | static int __init piix_ide_init(void) |
457 | { | 457 | { |
458 | piix_check_450nx(); | 458 | piix_check_450nx(); |
459 | return ide_pci_register_driver(&driver); | 459 | return ide_pci_register_driver(&piix_pci_driver); |
460 | } | 460 | } |
461 | 461 | ||
462 | static void __exit piix_ide_exit(void) | 462 | static void __exit piix_ide_exit(void) |
463 | { | 463 | { |
464 | pci_unregister_driver(&driver); | 464 | pci_unregister_driver(&piix_pci_driver); |
465 | } | 465 | } |
466 | 466 | ||
467 | module_init(piix_ide_init); | 467 | module_init(piix_ide_init); |