[PATCH] remove ifdef CONFIG_PCI from envctrl.c

[PATCH] remove ifdef CONFIG_PCI from envctrl.c

[Christoph Hellwig]

The driver already depends on CONFIG_PCI in Kconfig.  What I don't quite
understand yet is why a PCI-only driver sits in drivers/sbus/ ..


Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: linux-2.6/drivers/sbus/char/envctrl.c
=================================--- linux-2.6.orig/drivers/sbus/char/envctrl.c	2005-08-09 20:16:59.000000000 +0200
+++ linux-2.6/drivers/sbus/char/envctrl.c	2005-08-09 22:29:45.000000000 +0200
@@ -1041,7 +1041,6 @@
 
 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 @@
 			kfree(i2c_childlist[i].tables);
 	}
 	return err;
-#else
-	return -ENODEV;
-#endif
 }
 
 static void __exit envctrl_cleanup(void)

Re: [PATCH] remove ifdef CONFIG_PCI from envctrl.c

[David S. Miller]

From: Christoph Hellwig <hch@lst.de>
Date: Tue, 9 Aug 2005 22:31:19 +0200

> The driver already depends on CONFIG_PCI in Kconfig.  What I don't quite
> understand yet is why a PCI-only driver sits in drivers/sbus/ ..

There really isn't any place to put odd sparc drivers
other then drivers/sbus/char, especially since we still
don't use drivers/char/Kconfig

I hope to fix this kind of stuff at some point.  It is
ugly, indeed.

I'll apply your patch, thanks.