Pull bugzilla-5737 into release branch

[linux-2.6] / drivers / net / meth.c

diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index e23655f5049fa340ba432fc3ecb4fb90b1bd3d1e..d644bf3a933c7d4d7e199107063556f4073ca7f7 100644 (file)
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -62,7 +62,7 @@ MODULE_DESCRIPTION("SGI O2 Builtin Fast Ethernet driver");
 
 #ifdef HAVE_TX_TIMEOUT
 static int timeout = TX_TIMEOUT;
-MODULE_PARM(timeout, "i");
+module_param(timeout, int, 0);
 #endif
 
 /*