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/enc28j60_hw.h | |
| 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/enc28j60_hw.h')
| -rw-r--r-- | drivers/net/enc28j60_hw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/enc28j60_hw.h b/drivers/net/enc28j60_hw.h index 1a0b20969f80..25b41de49f0e 100644 --- a/drivers/net/enc28j60_hw.h +++ b/drivers/net/enc28j60_hw.h | |||
| @@ -303,7 +303,7 @@ | |||
| 303 | /* maximum ethernet frame length */ | 303 | /* maximum ethernet frame length */ |
| 304 | #define MAX_FRAMELEN 1518 | 304 | #define MAX_FRAMELEN 1518 |
| 305 | 305 | ||
| 306 | /* Prefered half duplex: LEDA: Link status LEDB: Rx/Tx activity */ | 306 | /* Preferred half duplex: LEDA: Link status LEDB: Rx/Tx activity */ |
| 307 | #define ENC28J60_LAMPS_MODE 0x3476 | 307 | #define ENC28J60_LAMPS_MODE 0x3476 |
| 308 | 308 | ||
| 309 | #endif | 309 | #endif |