diff options
| author |   Ashutosh Naik <ashutosh.naik@gmail.com> | 2005-11-06 23:43:22 -0800 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:42:54 -0500 |
| commit | 385023cb8972971540d17c92baf0132693955f5f (patch) | |
| tree | 1bbe26c618a6afee3b59c2ad0fa2421a2ff617f3 /drivers/net/dgrs.c | |
| parent | [PATCH] uml_net: use ethtool_ops (diff) | |
| download | linux-dev-385023cb8972971540d17c92baf0132693955f5f.tar.xz linux-dev-385023cb8972971540d17c92baf0132693955f5f.zip | |
[PATCH] dgrs: fix warnings when CONFIG_ISA and CONFIG_PCI are not enabled
This patch fixes compiler warnings when CONFIG_ISA and CONFIG_PCI are not
enabled in the dgrc network driver.
Signed-off-by: Ashutosh Naik <ashutosh.naik@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/dgrs.c')
| -rw-r--r-- | drivers/net/dgrs.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index 7809838e6c4c..2a290cc397ad 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c @@ -1549,7 +1549,7 @@ MODULE_PARM_DESC(nicmode, "Digi RightSwitch operating mode (1: switch, 2: multi- static int __init dgrs_init_module (void) { int i; - int eisacount = 0, pcicount = 0; + int cardcount = 0; /* * Command line variable overrides @@ -1591,15 +1591,13 @@ static int __init dgrs_init_module (void) * Find and configure all the cards */ #ifdef CONFIG_EISA - eisacount = eisa_driver_register(&dgrs_eisa_driver); - if (eisacount < 0) - return eisacount; -#endif -#ifdef CONFIG_PCI - pcicount = pci_register_driver(&dgrs_pci_driver); - if (pcicount) - return pcicount; + cardcount = eisa_driver_register(&dgrs_eisa_driver); + if (cardcount < 0) + return cardcount; #endif + cardcount = pci_register_driver(&dgrs_pci_driver); + if (cardcount) + return cardcount; return 0; } |