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/generic.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/generic.c')
-rw-r--r-- | drivers/ide/pci/generic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c index 092b238cb250..474f96a7c076 100644 --- a/drivers/ide/pci/generic.c +++ b/drivers/ide/pci/generic.c | |||
@@ -166,7 +166,7 @@ static const struct pci_device_id generic_pci_tbl[] = { | |||
166 | }; | 166 | }; |
167 | MODULE_DEVICE_TABLE(pci, generic_pci_tbl); | 167 | MODULE_DEVICE_TABLE(pci, generic_pci_tbl); |
168 | 168 | ||
169 | static struct pci_driver driver = { | 169 | static struct pci_driver generic_pci_driver = { |
170 | .name = "PCI_IDE", | 170 | .name = "PCI_IDE", |
171 | .id_table = generic_pci_tbl, | 171 | .id_table = generic_pci_tbl, |
172 | .probe = generic_init_one, | 172 | .probe = generic_init_one, |
@@ -177,12 +177,12 @@ static struct pci_driver driver = { | |||
177 | 177 | ||
178 | static int __init generic_ide_init(void) | 178 | static int __init generic_ide_init(void) |
179 | { | 179 | { |
180 | return ide_pci_register_driver(&driver); | 180 | return ide_pci_register_driver(&generic_pci_driver); |
181 | } | 181 | } |
182 | 182 | ||
183 | static void __exit generic_ide_exit(void) | 183 | static void __exit generic_ide_exit(void) |
184 | { | 184 | { |
185 | pci_unregister_driver(&driver); | 185 | pci_unregister_driver(&generic_pci_driver); |
186 | } | 186 | } |
187 | 187 | ||
188 | module_init(generic_ide_init); | 188 | module_init(generic_ide_init); |