From 7525d4bf991879f489c59988cbf162558b9d6489 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Mon, 2 Oct 2006 21:08:22 -0400 Subject: [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 Signed-off-by: Linus Torvalds --- drivers/net/Space.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net/Space.c') diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 9953201c670..a67f5efc983 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 -- cgit v1.2.3