summaryrefslogtreecommitdiffstats
path: root/drivers/net/Space.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-02 21:08:22 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-02 19:46:18 -0700
commit7525d4bf991879f489c59988cbf162558b9d6489 (patch)
tree9069d85accaa56a91ce0f8d86be581f25a9f8177 /drivers/net/Space.c
parent0e4a523fa3981f20c3887803cebef1ad2948a0d4 (diff)
downloadlinux-7525d4bf991879f489c59988cbf162558b9d6489.tar.gz
linux-7525d4bf991879f489c59988cbf162558b9d6489.tar.bz2
linux-7525d4bf991879f489c59988cbf162558b9d6489.zip
[PATCH] hp100: fix conditional compilation mess
The previous hp100 changeset attempted to kill warnings, but was only tested on !CONFIG_ISA platforms. The correct conditional compilation setup involves tested CONFIG_ISA rather than just MODULE. Fixes link on CONFIG_ISA platforms (i386) in current -git. Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/Space.c')
-rw-r--r--drivers/net/Space.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 9953201c670d..a67f5efc983f 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -165,7 +165,7 @@ static struct devprobe2 mca_probes[] __initdata = {
* look for EISA/PCI/MCA cards in addition to ISA cards).
*/
static struct devprobe2 isa_probes[] __initdata = {
-#ifdef CONFIG_HP100 /* ISA, EISA & PCI */
+#if defined(CONFIG_HP100) && defined(CONFIG_ISA) /* ISA, EISA */
{hp100_probe, 0},
#endif
#ifdef CONFIG_3C515