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/arm/w90p910_ether.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/arm/w90p910_ether.c')
| -rw-r--r-- | drivers/net/arm/w90p910_ether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c index 4545d5a06c24..bfea499a3513 100644 --- a/drivers/net/arm/w90p910_ether.c +++ b/drivers/net/arm/w90p910_ether.c | |||
| @@ -117,7 +117,7 @@ | |||
| 117 | #define TX_DESC_SIZE 10 | 117 | #define TX_DESC_SIZE 10 |
| 118 | #define MAX_RBUFF_SZ 0x600 | 118 | #define MAX_RBUFF_SZ 0x600 |
| 119 | #define MAX_TBUFF_SZ 0x600 | 119 | #define MAX_TBUFF_SZ 0x600 |
| 120 | #define TX_TIMEOUT 50 | 120 | #define TX_TIMEOUT (HZ/2) |
| 121 | #define DELAY 1000 | 121 | #define DELAY 1000 |
| 122 | #define CAM0 0x0 | 122 | #define CAM0 0x0 |
| 123 | 123 | ||