summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-01-06 11:08:07 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-01-06 11:08:07 -0500
commit269403f565718bf3be985f731c7f52a067364111 (patch)
treeddfd0841f79e49846e5b6e2a778641896c8c39ca
parentc31e5bb0cf22a4b97b3cafb9247c476de92456f2 (diff)
[PATCH] xircom_tulip_cb.c build fix
From: Bernhard Rosenkraenzer <bero@arklinux.org>, Adrian Bunk <bunk@stusta.de> - Define `debug' before using it. - remove now-unneeded module_parm_array hack. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/tulip/xircom_tulip_cb.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c
index 5b0647c2f44c..32ccb26890c3 100644
--- a/drivers/net/tulip/xircom_tulip_cb.c
+++ b/drivers/net/tulip/xircom_tulip_cb.c
@@ -33,6 +33,13 @@
/* A few user-configurable values. */
+#define xircom_debug debug
+#ifdef XIRCOM_DEBUG
+static int xircom_debug = XIRCOM_DEBUG;
+#else
+static int xircom_debug = 1;
+#endif
+
/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
static int max_interrupt_work = 25;
@@ -124,19 +131,11 @@ module_param(max_interrupt_work, int, 0);
module_param(rx_copybreak, int, 0);
module_param(csr0, int, 0);
-static int num_units;
-module_param_array(options, num_units, int, 0);
-module_param_array(full_duplex, num_units, int, 0);
+module_param_array(options, int, NULL, 0);
+module_param_array(full_duplex, int, NULL, 0);
#define RUN_AT(x) (jiffies + (x))
-#define xircom_debug debug
-#ifdef XIRCOM_DEBUG
-static int xircom_debug = XIRCOM_DEBUG;
-#else
-static int xircom_debug = 1;
-#endif
-
/*
Theory of Operation