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/lance.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/lance.c')
| -rw-r--r-- | drivers/net/lance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index f06296bfe293..02336edce748 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
| @@ -207,7 +207,7 @@ tx_full and tbusy flags. | |||
| 207 | #define LANCE_BUS_IF 0x16 | 207 | #define LANCE_BUS_IF 0x16 |
| 208 | #define LANCE_TOTAL_SIZE 0x18 | 208 | #define LANCE_TOTAL_SIZE 0x18 |
| 209 | 209 | ||
| 210 | #define TX_TIMEOUT 20 | 210 | #define TX_TIMEOUT (HZ/5) |
| 211 | 211 | ||
| 212 | /* The LANCE Rx and Tx ring descriptors. */ | 212 | /* The LANCE Rx and Tx ring descriptors. */ |
| 213 | struct lance_rx_head { | 213 | struct lance_rx_head { |