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 19:46:18 -0700 |
| commit | 7525d4bf991879f489c59988cbf162558b9d6489 (patch) | |
| tree | 9069d85accaa56a91ce0f8d86be581f25a9f8177 /drivers/net/hp100.c | |
| parent | 0e4a523fa3981f20c3887803cebef1ad2948a0d4 (diff) | |
| download | linux-7525d4bf991879f489c59988cbf162558b9d6489.tar.gz | |
[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/hp100.c')
| -rw-r--r-- | drivers/net/hp100.c | 8 |
1 files changed, 5 insertions, 3 deletions
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) |