diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/82596.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/82596.c')
| -rw-r--r-- | drivers/net/82596.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index e2c9c5b949f9..be1f1970c842 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
| @@ -191,7 +191,7 @@ enum commands { | |||
| 191 | #define RX_SUSPEND 0x0030 | 191 | #define RX_SUSPEND 0x0030 |
| 192 | #define RX_ABORT 0x0040 | 192 | #define RX_ABORT 0x0040 |
| 193 | 193 | ||
| 194 | #define TX_TIMEOUT 5 | 194 | #define TX_TIMEOUT (HZ/20) |
| 195 | 195 | ||
| 196 | 196 | ||
| 197 | struct i596_reg { | 197 | struct i596_reg { |