From a9ab09e26055a76295548ca36ec00de2f4367d32 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 13 Oct 2008 21:39:41 +0200 Subject: ide: use unique names for struct pci_driver instances Noticed-by: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/pci/triflex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/ide/pci/triflex.c') 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[] = { }; MODULE_DEVICE_TABLE(pci, triflex_pci_tbl); -static struct pci_driver driver = { +static struct pci_driver triflex_pci_driver = { .name = "TRIFLEX_IDE", .id_table = triflex_pci_tbl, .probe = triflex_init_one, @@ -124,12 +124,12 @@ static struct pci_driver driver = { static int __init triflex_ide_init(void) { - return ide_pci_register_driver(&driver); + return ide_pci_register_driver(&triflex_pci_driver); } static void __exit triflex_ide_exit(void) { - pci_unregister_driver(&driver); + pci_unregister_driver(&triflex_pci_driver); } module_init(triflex_ide_init); -- cgit v1.2.2