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/jmicron.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/jmicron.c')
-rw-r--r-- | drivers/ide/pci/jmicron.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c index acd647110648..9a68433cf46d 100644 --- a/drivers/ide/pci/jmicron.c +++ b/drivers/ide/pci/jmicron.c | |||
@@ -149,7 +149,7 @@ static struct pci_device_id jmicron_pci_tbl[] = { | |||
149 | 149 | ||
150 | MODULE_DEVICE_TABLE(pci, jmicron_pci_tbl); | 150 | MODULE_DEVICE_TABLE(pci, jmicron_pci_tbl); |
151 | 151 | ||
152 | static struct pci_driver driver = { | 152 | static struct pci_driver jmicron_pci_driver = { |
153 | .name = "JMicron IDE", | 153 | .name = "JMicron IDE", |
154 | .id_table = jmicron_pci_tbl, | 154 | .id_table = jmicron_pci_tbl, |
155 | .probe = jmicron_init_one, | 155 | .probe = jmicron_init_one, |
@@ -160,12 +160,12 @@ static struct pci_driver driver = { | |||
160 | 160 | ||
161 | static int __init jmicron_ide_init(void) | 161 | static int __init jmicron_ide_init(void) |
162 | { | 162 | { |
163 | return ide_pci_register_driver(&driver); | 163 | return ide_pci_register_driver(&jmicron_pci_driver); |
164 | } | 164 | } |
165 | 165 | ||
166 | static void __exit jmicron_ide_exit(void) | 166 | static void __exit jmicron_ide_exit(void) |
167 | { | 167 | { |
168 | pci_unregister_driver(&driver); | 168 | pci_unregister_driver(&jmicron_pci_driver); |
169 | } | 169 | } |
170 | 170 | ||
171 | module_init(jmicron_ide_init); | 171 | module_init(jmicron_ide_init); |