diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/meth.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/meth.c')
| -rw-r--r-- | drivers/net/meth.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c index 2af81735386b..9f72cb45f4af 100644 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c | |||
| @@ -51,14 +51,11 @@ | |||
| 51 | 51 | ||
| 52 | static const char *meth_str="SGI O2 Fast Ethernet"; | 52 | static const char *meth_str="SGI O2 Fast Ethernet"; |
| 53 | 53 | ||
| 54 | #define HAVE_TX_TIMEOUT | ||
| 55 | /* The maximum time waited (in jiffies) before assuming a Tx failed. (400ms) */ | 54 | /* The maximum time waited (in jiffies) before assuming a Tx failed. (400ms) */ |
| 56 | #define TX_TIMEOUT (400*HZ/1000) | 55 | #define TX_TIMEOUT (400*HZ/1000) |
| 57 | 56 | ||
| 58 | #ifdef HAVE_TX_TIMEOUT | ||
| 59 | static int timeout = TX_TIMEOUT; | 57 | static int timeout = TX_TIMEOUT; |
| 60 | module_param(timeout, int, 0); | 58 | module_param(timeout, int, 0); |
| 61 | #endif | ||
| 62 | 59 | ||
| 63 | /* | 60 | /* |
| 64 | * This structure is private to each device. It is used to pass | 61 | * This structure is private to each device. It is used to pass |