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/cmd64x.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/cmd64x.c')
-rw-r--r-- | drivers/ide/pci/cmd64x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index 456dee18b660..bb89c505074c 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c | |||
@@ -505,7 +505,7 @@ static const struct pci_device_id cmd64x_pci_tbl[] = { | |||
505 | }; | 505 | }; |
506 | MODULE_DEVICE_TABLE(pci, cmd64x_pci_tbl); | 506 | MODULE_DEVICE_TABLE(pci, cmd64x_pci_tbl); |
507 | 507 | ||
508 | static struct pci_driver driver = { | 508 | static struct pci_driver cmd64x_pci_driver = { |
509 | .name = "CMD64x_IDE", | 509 | .name = "CMD64x_IDE", |
510 | .id_table = cmd64x_pci_tbl, | 510 | .id_table = cmd64x_pci_tbl, |
511 | .probe = cmd64x_init_one, | 511 | .probe = cmd64x_init_one, |
@@ -516,12 +516,12 @@ static struct pci_driver driver = { | |||
516 | 516 | ||
517 | static int __init cmd64x_ide_init(void) | 517 | static int __init cmd64x_ide_init(void) |
518 | { | 518 | { |
519 | return ide_pci_register_driver(&driver); | 519 | return ide_pci_register_driver(&cmd64x_pci_driver); |
520 | } | 520 | } |
521 | 521 | ||
522 | static void __exit cmd64x_ide_exit(void) | 522 | static void __exit cmd64x_ide_exit(void) |
523 | { | 523 | { |
524 | pci_unregister_driver(&driver); | 524 | pci_unregister_driver(&cmd64x_pci_driver); |
525 | } | 525 | } |
526 | 526 | ||
527 | module_init(cmd64x_ide_init); | 527 | module_init(cmd64x_ide_init); |