lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] hp100: fix conditional compilation mess

Browse Source 
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>
This commit is contained in:
Jeff Garzik
2006-10-02 21:08:22 -04:00
committed by Linus Torvalds
parent 0e4a523fa3
commit 7525d4bf99
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/Space.c
View File

@@ -165,7 +165,7 @@ static struct devprobe2 mca_probes[] __initdata = {
* look for EISA/PCI/MCA cards in addition to ISA cards). * look for EISA/PCI/MCA cards in addition to ISA cards).
*/ */
static struct devprobe2 isa_probes[] __initdata = { static struct devprobe2 isa_probes[] __initdata = {
#ifdef CONFIG_HP100 /* ISA, EISA & PCI */ #if defined(CONFIG_HP100) && defined(CONFIG_ISA) /* ISA, EISA */
{hp100_probe, 0}, {hp100_probe, 0},
#endif #endif
#ifdef CONFIG_3C515 #ifdef CONFIG_3C515

8
drivers/net/hp100.c
View File

@@ -188,7 +188,7 @@ struct hp100_private {
/* /*
* variables * variables
*/ */
#ifndef MODULE #ifdef CONFIG_ISA
static const char *hp100_isa_tbl[] = { static const char *hp100_isa_tbl[] = {
"HWPF150", /* HP J2573 rev A */ "HWPF150", /* HP J2573 rev A */
"HWP1950", /* HP J2573 */ "HWP1950", /* HP J2573 */
@@ -335,7 +335,7 @@ static __devinit const char *hp100_read_id(int ioaddr)
return str; return str;
} }
#ifndef MODULE #ifdef CONFIG_ISA
static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr) static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr)
{ {
const char *sig; const char *sig;
@@ -393,7 +393,9 @@ static int __init hp100_isa_probe(struct net_device *dev, int addr)
} }
return err; return err;
} }
#endif /* CONFIG_ISA */
#if !defined(MODULE) && defined(CONFIG_ISA)
struct net_device * __init hp100_probe(int unit) struct net_device * __init hp100_probe(int unit)
{ {
struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); 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); free_netdev(dev);
return ERR_PTR(err); return ERR_PTR(err);
} }
#endif #endif /* !MODULE && CONFIG_ISA */
static int __devinit hp100_probe1(struct net_device *dev, int ioaddr, static int __devinit hp100_probe1(struct net_device *dev, int ioaddr,
u_char bus, struct pci_dev *pci_dev) u_char bus, struct pci_dev *pci_dev)