aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/triflex.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:41 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:41 -0400
commita9ab09e26055a76295548ca36ec00de2f4367d32 (patch)
tree51f1c279e74e3d5b3ec920b33fae579339dd67ad /drivers/ide/pci/triflex.c
parentd6ff9f64e68d23feab44efa07cc6aee01f3ef32b (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/triflex.c')
-rw-r--r--drivers/ide/pci/triflex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 42fb98f268d5..b6ff40336aa9 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -113,7 +113,7 @@ static const struct pci_device_id triflex_pci_tbl[] = {
113}; 113};
114MODULE_DEVICE_TABLE(pci, triflex_pci_tbl); 114MODULE_DEVICE_TABLE(pci, triflex_pci_tbl);
115 115
116static struct pci_driver driver = { 116static struct pci_driver triflex_pci_driver = {
117 .name = "TRIFLEX_IDE", 117 .name = "TRIFLEX_IDE",
118 .id_table = triflex_pci_tbl, 118 .id_table = triflex_pci_tbl,
119 .probe = triflex_init_one, 119 .probe = triflex_init_one,
@@ -124,12 +124,12 @@ static struct pci_driver driver = {
124 124
125static int __init triflex_ide_init(void) 125static int __init triflex_ide_init(void)
126{ 126{
127 return ide_pci_register_driver(&driver); 127 return ide_pci_register_driver(&triflex_pci_driver);
128} 128}
129 129
130static void __exit triflex_ide_exit(void) 130static void __exit triflex_ide_exit(void)
131{ 131{
132 pci_unregister_driver(&driver); 132 pci_unregister_driver(&triflex_pci_driver);
133} 133}
134 134
135module_init(triflex_ide_init); 135module_init(triflex_ide_init);