summaryrefslogtreecommitdiffstats
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
parent0e4a523fa3981f20c3887803cebef1ad2948a0d4 (diff)
downloadlinux-7525d4bf991879f489c59988cbf162558b9d6489.tar.bz2
[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>
-rw-r--r--drivers/net/Space.c2
-rw-r--r--drivers/net/hp100.c8
2 files changed, 6 insertions, 4 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
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 561db440bc2c..ae8ad4f763bf 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -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_id(int ioaddr)
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(struct net_device *dev, int addr)
}
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 @@ struct net_device * __init hp100_probe(int unit)
free_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)