diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-01 13:32:20 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-01 13:32:20 +0200 |
| commit | 2c81fbc4cfc895e80c18fffdc04a3d870eb16cb8 (patch) | |
| tree | a298595be573e32b250a030bf08f6b53a64c9ec6 | |
| parent | drivers/net/wireless/{airo,ipw2100}: fix error handling bugs (diff) | |
| download | linux-2c81fbc4cfc895e80c18fffdc04a3d870eb16cb8.tar.xz linux-2c81fbc4cfc895e80c18fffdc04a3d870eb16cb8.zip | |
[netdrvr] hp100: encapsulate all non-module code
The previous '#ifndef MODULE' block did not cover all the
static-build-only code. Now it does.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/hp100.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index 03b3df33d81b..561db440bc2c 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c @@ -188,10 +188,12 @@ struct hp100_private { /* * variables */ +#ifndef MODULE static const char *hp100_isa_tbl[] = { "HWPF150", /* HP J2573 rev A */ "HWP1950", /* HP J2573 */ }; +#endif #ifdef CONFIG_EISA static struct eisa_device_id hp100_eisa_tbl[] = { @@ -333,6 +335,7 @@ static __devinit const char *hp100_read_id(int ioaddr) return str; } +#ifndef MODULE static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr) { const char *sig; @@ -391,8 +394,6 @@ static int __init hp100_isa_probe(struct net_device *dev, int addr) return err; } - -#ifndef MODULE struct net_device * __init hp100_probe(int unit) { struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); |