From: Christoph Hellwig <hch@lst.de>
Date: Tue, 9 Aug 2005 21:39:10 +0000 (-0700)
Subject: [SPARC]: remove ifdef CONFIG_PCI from envctrl.c
X-Git-Tag: v2.6.13-rc7~117^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4875ccdb304775e9fd830f644643a1513357e043;p=linux-2.6

[SPARC]: remove ifdef CONFIG_PCI from envctrl.c

The driver already depends on CONFIG_PCI in Kconfig.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index e103b12f9e..1247f81a32 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -1039,7 +1039,6 @@ static int kenvctrld(void *__unused)
 
 static int __init envctrl_init(void)
 {
-#ifdef CONFIG_PCI
 	struct linux_ebus *ebus = NULL;
 	struct linux_ebus_device *edev = NULL;
 	struct linux_ebus_child *edev_child = NULL;
@@ -1133,9 +1132,6 @@ out_iounmap:
 			kfree(i2c_childlist[i].tables);
 	}
 	return err;
-#else
-	return -ENODEV;
-#endif
 }
 
 static void __exit envctrl_cleanup(void)