diff options
-rw-r--r-- | drivers/net/Space.c | 2 | ||||
-rw-r--r-- | drivers/net/hp100.c | 8 |
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 = { | |||
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 |
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 { | |||
188 | /* | 188 | /* |
189 | * variables | 189 | * variables |
190 | */ | 190 | */ |
191 | #ifndef MODULE | 191 | #ifdef CONFIG_ISA |
192 | static const char *hp100_isa_tbl[] = { | 192 | static const char *hp100_isa_tbl[] = { |
193 | "HWPF150", /* HP J2573 rev A */ | 193 | "HWPF150", /* HP J2573 rev A */ |
194 | "HWP1950", /* HP J2573 */ | 194 | "HWP1950", /* HP J2573 */ |
@@ -335,7 +335,7 @@ static __devinit const char *hp100_read_id(int ioaddr) | |||
335 | return str; | 335 | return str; |
336 | } | 336 | } |
337 | 337 | ||
338 | #ifndef MODULE | 338 | #ifdef CONFIG_ISA |
339 | static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr) | 339 | static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr) |
340 | { | 340 | { |
341 | const char *sig; | 341 | const char *sig; |
@@ -393,7 +393,9 @@ static int __init hp100_isa_probe(struct net_device *dev, int addr) | |||
393 | } | 393 | } |
394 | return err; | 394 | return err; |
395 | } | 395 | } |
396 | #endif /* CONFIG_ISA */ | ||
396 | 397 | ||
398 | #if !defined(MODULE) && defined(CONFIG_ISA) | ||
397 | struct net_device * __init hp100_probe(int unit) | 399 | struct net_device * __init hp100_probe(int unit) |
398 | { | 400 | { |
399 | struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); | 401 | struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); |
@@ -423,7 +425,7 @@ struct net_device * __init hp100_probe(int unit) | |||
423 | free_netdev(dev); | 425 | free_netdev(dev); |
424 | return ERR_PTR(err); | 426 | return ERR_PTR(err); |
425 | } | 427 | } |
426 | #endif | 428 | #endif /* !MODULE && CONFIG_ISA */ |
427 | 429 | ||
428 | static int __devinit hp100_probe1(struct net_device *dev, int ioaddr, | 430 | static int __devinit hp100_probe1(struct net_device *dev, int ioaddr, |
429 | u_char bus, struct pci_dev *pci_dev) | 431 | u_char bus, struct pci_dev *pci_dev) |