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/amd74xx.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/amd74xx.c')
-rw-r--r-- | drivers/ide/pci/amd74xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index 7dbc692c84c3..81ec73134eda 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
@@ -319,7 +319,7 @@ static const struct pci_device_id amd74xx_pci_tbl[] = { | |||
319 | }; | 319 | }; |
320 | MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl); | 320 | MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl); |
321 | 321 | ||
322 | static struct pci_driver driver = { | 322 | static struct pci_driver amd74xx_pci_driver = { |
323 | .name = "AMD_IDE", | 323 | .name = "AMD_IDE", |
324 | .id_table = amd74xx_pci_tbl, | 324 | .id_table = amd74xx_pci_tbl, |
325 | .probe = amd74xx_probe, | 325 | .probe = amd74xx_probe, |
@@ -330,12 +330,12 @@ static struct pci_driver driver = { | |||
330 | 330 | ||
331 | static int __init amd74xx_ide_init(void) | 331 | static int __init amd74xx_ide_init(void) |
332 | { | 332 | { |
333 | return ide_pci_register_driver(&driver); | 333 | return ide_pci_register_driver(&amd74xx_pci_driver); |
334 | } | 334 | } |
335 | 335 | ||
336 | static void __exit amd74xx_ide_exit(void) | 336 | static void __exit amd74xx_ide_exit(void) |
337 | { | 337 | { |
338 | pci_unregister_driver(&driver); | 338 | pci_unregister_driver(&amd74xx_pci_driver); |
339 | } | 339 | } |
340 | 340 | ||
341 | module_init(amd74xx_ide_init); | 341 | module_init(amd74xx_ide_init); |