From 190c68ff5a554e4317109b7d66652a07af612606 Mon Sep 17 00:00:00 2001
From: Ashutosh Naik <ashutosh.naik@gmail.com>
Date: Sun, 6 Nov 2005 23:43:22 -0800
Subject: [PATCH] --- yaml --- r: 13611 b: refs/heads/master c:
 385023cb8972971540d17c92baf0132693955f5f h: refs/heads/master i:   13609:
 7c97dfcd1cad7e7c43a9d6ad64fead95cb8f0027   13607:
 892817f6f3080898469b1a616a512bbebd5a8121 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/dgrs.c | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index fa973b7ee3e5..1a2884b291ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3874844f3279f170dca5339b8a94d6f1868425
+refs/heads/master: 385023cb8972971540d17c92baf0132693955f5f
diff --git a/trunk/drivers/net/dgrs.c b/trunk/drivers/net/dgrs.c
index 7809838e6c4c..2a290cc397ad 100644
--- a/trunk/drivers/net/dgrs.c
+++ b/trunk/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;
 }