Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 385023cb authored by Ashutosh Naik's avatar Ashutosh Naik Committed by Jeff Garzik
Browse files

[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: default avatarAshutosh Naik <ashutosh.naik@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 6d387484
Loading
Loading
Loading
Loading
+7 −9
Original line number Diff line number Diff line
@@ -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;
}