Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / arm / w90p910_ether.c

diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c
index 4545d5a06c24f9e9cea64a70db01327a1d52ad21..bfea499a351309f2292998208e9b302ff3a58c07 100644 (file)
--- a/drivers/net/arm/w90p910_ether.c
+++ b/drivers/net/arm/w90p910_ether.c
@@ -117,7 +117,7 @@
 #define TX_DESC_SIZE           10
 #define MAX_RBUFF_SZ           0x600
 #define MAX_TBUFF_SZ           0x600
-#define TX_TIMEOUT             50
+#define TX_TIMEOUT             (HZ/2)
 #define DELAY                  1000
 #define CAM0                   0x0