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/scc_pata.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/scc_pata.c')
-rw-r--r-- | drivers/ide/pci/scc_pata.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index c2e85fc21b5a..3e75bf5f5e37 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
@@ -944,7 +944,7 @@ static const struct pci_device_id scc_pci_tbl[] = { | |||
944 | }; | 944 | }; |
945 | MODULE_DEVICE_TABLE(pci, scc_pci_tbl); | 945 | MODULE_DEVICE_TABLE(pci, scc_pci_tbl); |
946 | 946 | ||
947 | static struct pci_driver driver = { | 947 | static struct pci_driver scc_pci_driver = { |
948 | .name = "SCC IDE", | 948 | .name = "SCC IDE", |
949 | .id_table = scc_pci_tbl, | 949 | .id_table = scc_pci_tbl, |
950 | .probe = scc_init_one, | 950 | .probe = scc_init_one, |
@@ -953,14 +953,14 @@ static struct pci_driver driver = { | |||
953 | 953 | ||
954 | static int scc_ide_init(void) | 954 | static int scc_ide_init(void) |
955 | { | 955 | { |
956 | return ide_pci_register_driver(&driver); | 956 | return ide_pci_register_driver(&scc_pci_driver); |
957 | } | 957 | } |
958 | 958 | ||
959 | module_init(scc_ide_init); | 959 | module_init(scc_ide_init); |
960 | /* -- No exit code? | 960 | /* -- No exit code? |
961 | static void scc_ide_exit(void) | 961 | static void scc_ide_exit(void) |
962 | { | 962 | { |
963 | ide_pci_unregister_driver(&driver); | 963 | ide_pci_unregister_driver(&scc_pci_driver); |
964 | } | 964 | } |
965 | module_exit(scc_ide_exit); | 965 | module_exit(scc_ide_exit); |
966 | */ | 966 | */ |