aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-01 07:32:20 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-01 07:32:20 -0400
commit2c81fbc4cfc895e80c18fffdc04a3d870eb16cb8 (patch)
treea298595be573e32b250a030bf08f6b53a64c9ec6
parentde897881e474cae06cf06c830fcadc916c53ce64 (diff)
[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.c5
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 {
188/* 188/*
189 * variables 189 * variables
190 */ 190 */
191#ifndef MODULE
191static const char *hp100_isa_tbl[] = { 192static const char *hp100_isa_tbl[] = {
192 "HWPF150", /* HP J2573 rev A */ 193 "HWPF150", /* HP J2573 rev A */
193 "HWP1950", /* HP J2573 */ 194 "HWP1950", /* HP J2573 */
194}; 195};
196#endif
195 197
196#ifdef CONFIG_EISA 198#ifdef CONFIG_EISA
197static struct eisa_device_id hp100_eisa_tbl[] = { 199static struct eisa_device_id hp100_eisa_tbl[] = {
@@ -333,6 +335,7 @@ static __devinit const char *hp100_read_id(int ioaddr)
333 return str; 335 return str;
334} 336}
335 337
338#ifndef MODULE
336static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr) 339static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr)
337{ 340{
338 const char *sig; 341 const char *sig;
@@ -391,8 +394,6 @@ static int __init hp100_isa_probe(struct net_device *dev, int addr)
391 return err; 394 return err;
392} 395}
393 396
394
395#ifndef MODULE
396struct net_device * __init hp100_probe(int unit) 397struct net_device * __init hp100_probe(int unit)
397{ 398{
398 struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); 399 struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));