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/sunbmac.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/sunbmac.h')
| -rw-r--r-- | drivers/net/sunbmac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h index 8db88945b889..4943e975a731 100644 --- a/drivers/net/sunbmac.h +++ b/drivers/net/sunbmac.h | |||
| @@ -185,7 +185,7 @@ | |||
| 185 | #define BIGMAC_RXCFG_ENABLE 0x00000001 /* Enable the receiver */ | 185 | #define BIGMAC_RXCFG_ENABLE 0x00000001 /* Enable the receiver */ |
| 186 | #define BIGMAC_RXCFG_FIFO 0x0000000e /* Default rx fthresh... */ | 186 | #define BIGMAC_RXCFG_FIFO 0x0000000e /* Default rx fthresh... */ |
| 187 | #define BIGMAC_RXCFG_PSTRIP 0x00000020 /* Pad byte strip enable */ | 187 | #define BIGMAC_RXCFG_PSTRIP 0x00000020 /* Pad byte strip enable */ |
| 188 | #define BIGMAC_RXCFG_PMISC 0x00000040 /* Enable promiscous mode */ | 188 | #define BIGMAC_RXCFG_PMISC 0x00000040 /* Enable promiscuous mode */ |
| 189 | #define BIGMAC_RXCFG_DERR 0x00000080 /* Disable error checking */ | 189 | #define BIGMAC_RXCFG_DERR 0x00000080 /* Disable error checking */ |
| 190 | #define BIGMAC_RXCFG_DCRCS 0x00000100 /* Disable CRC stripping */ | 190 | #define BIGMAC_RXCFG_DCRCS 0x00000100 /* Disable CRC stripping */ |
| 191 | #define BIGMAC_RXCFG_ME 0x00000200 /* Receive packets addressed to me */ | 191 | #define BIGMAC_RXCFG_ME 0x00000200 /* Receive packets addressed to me */ |