hp100: fix conditional compilation mess
Subsystems (2)
PATCH 1/1 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 <[email protected]>
---
drivers/net/Space.c | 2 +- drivers/net/hp100.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/Space.c +1 -1
@@ -165,7 +165,7 @@ #endif* 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
drivers/net/hp100.c +5 -3
@@ -188,7 +188,7 @@ struct hp100_private {/* * variables */ -#ifndef MODULE +#ifdef CONFIG_ISA static const char *hp100_isa_tbl[] = {"HWPF150" ,/* HP J2573 rev A */ "HWP1950", /* HP J2573 */
@@ -335,7 +335,7 @@ static __devinit const char *hp100_read_return str; } -#ifndef MODULE +#ifdef CONFIG_ISA static __init int hp100_isa_probe1 (struct net_device *dev,int ioaddr) {const char *sig;
@@ -393,7 +393,9 @@ static int __init hp100_isa_probe(struc }return err; } +#endif /* CONFIG_ISA */ +#if !defined(MODULE ) && defined(CONFIG_ISA )struct net_device *__init hp100_probe (int unit) {struct net_device *dev =alloc_etherdev (sizeof (struct hp100_private ));
@@ -423,7 +425,7 @@ #endiffree_netdev (dev); return ERR_PTR(err); } -#endif +#endif /* !MODULE && CONFIG_ISA */ static int __devinit hp100_probe1 (struct net_device *dev,int ioaddr,u_char bus,struct pci_dev *pci_dev)