diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 21:39:41 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 21:39:41 +0200 |
| commit | a9ab09e26055a76295548ca36ec00de2f4367d32 (patch) | |
| tree | 51f1c279e74e3d5b3ec920b33fae579339dd67ad /drivers/ide/pci/piix.c | |
| parent | ide: merge all TASKFILE_NO_DATA data phase handlers into taskfile_no_intr() (diff) | |
| download | linux-a9ab09e26055a76295548ca36ec00de2f4367d32.tar.xz linux-a9ab09e26055a76295548ca36ec00de2f4367d32.zip | |
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[] = { }; MODULE_DEVICE_TABLE(pci, piix_pci_tbl); -static struct pci_driver driver = { +static struct pci_driver piix_pci_driver = { .name = "PIIX_IDE", .id_table = piix_pci_tbl, .probe = piix_init_one, @@ -456,12 +456,12 @@ static struct pci_driver driver = { static int __init piix_ide_init(void) { piix_check_450nx(); - return ide_pci_register_driver(&driver); + return ide_pci_register_driver(&piix_pci_driver); } static void __exit piix_ide_exit(void) { - pci_unregister_driver(&driver); + pci_unregister_driver(&piix_pci_driver); } module_init(piix_ide_init); |