diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-02 21:08:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 22:46:18 -0400 |
| commit | 7525d4bf991879f489c59988cbf162558b9d6489 (patch) | |
| tree | 9069d85accaa56a91ce0f8d86be581f25a9f8177 /drivers/net/Space.c | |
| parent | 0e4a523fa3981f20c3887803cebef1ad2948a0d4 (diff) | |
[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.c | 2 |
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 = { | |||
| 165 | * look for EISA/PCI/MCA cards in addition to ISA cards). | 165 | * look for EISA/PCI/MCA cards in addition to ISA cards). |
| 166 | */ | 166 | */ |
| 167 | static struct devprobe2 isa_probes[] __initdata = { | 167 | static struct devprobe2 isa_probes[] __initdata = { |
| 168 | #ifdef CONFIG_HP100 /* ISA, EISA & PCI */ | 168 | #if defined(CONFIG_HP100) && defined(CONFIG_ISA) /* ISA, EISA */ |
| 169 | {hp100_probe, 0}, | 169 | {hp100_probe, 0}, |
| 170 | #endif | 170 | #endif |
| 171 | #ifdef CONFIG_3C515 | 171 | #ifdef CONFIG_3C515 |