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/siimage.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/siimage.c')
-rw-r--r-- | drivers/ide/pci/siimage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 134868c71c34..0652e31119ef 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -830,7 +830,7 @@ static const struct pci_device_id siimage_pci_tbl[] = { | |||
830 | }; | 830 | }; |
831 | MODULE_DEVICE_TABLE(pci, siimage_pci_tbl); | 831 | MODULE_DEVICE_TABLE(pci, siimage_pci_tbl); |
832 | 832 | ||
833 | static struct pci_driver driver = { | 833 | static struct pci_driver siimage_pci_driver = { |
834 | .name = "SiI_IDE", | 834 | .name = "SiI_IDE", |
835 | .id_table = siimage_pci_tbl, | 835 | .id_table = siimage_pci_tbl, |
836 | .probe = siimage_init_one, | 836 | .probe = siimage_init_one, |
@@ -841,12 +841,12 @@ static struct pci_driver driver = { | |||
841 | 841 | ||
842 | static int __init siimage_ide_init(void) | 842 | static int __init siimage_ide_init(void) |
843 | { | 843 | { |
844 | return ide_pci_register_driver(&driver); | 844 | return ide_pci_register_driver(&siimage_pci_driver); |
845 | } | 845 | } |
846 | 846 | ||
847 | static void __exit siimage_ide_exit(void) | 847 | static void __exit siimage_ide_exit(void) |
848 | { | 848 | { |
849 | pci_unregister_driver(&driver); | 849 | pci_unregister_driver(&siimage_pci_driver); |
850 | } | 850 | } |
851 | 851 | ||
852 | module_init(siimage_ide_init); | 852 | module_init(siimage_ide_init); |