From 908f457552302a73555fd015f6f363ab49c4592c Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 1 Oct 2006 07:32:20 -0400
Subject: [PATCH] --- yaml --- r: 37972 b: refs/heads/master c:
 2c81fbc4cfc895e80c18fffdc04a3d870eb16cb8 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/hp100.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e1af4f2696aa..50496c28ef21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de897881e474cae06cf06c830fcadc916c53ce64
+refs/heads/master: 2c81fbc4cfc895e80c18fffdc04a3d870eb16cb8
diff --git a/trunk/drivers/net/hp100.c b/trunk/drivers/net/hp100.c
index 03b3df33d81b..561db440bc2c 100644
--- a/trunk/drivers/net/hp100.c
+++ b/trunk/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));