diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-22 04:28:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-22 04:28:56 -0400 |
| commit | 65c2ce70046c779974af8b5dfc25a0df489089b5 (patch) | |
| tree | b16f152eb62b71cf5a1edc51da865b357c989922 /drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h | |
| parent | 842514849a616e9b61acad65771c7afe01e651f9 (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
Merge tag 'v3.15-rc6' into sched/core, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h')
| -rw-r--r-- | drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h b/drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h index 5a89acb4c505..56f8bf5a3f1b 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h | |||
| @@ -52,6 +52,10 @@ | |||
| 52 | #define SXGBE_CORE_RX_CTL2_REG 0x00A8 | 52 | #define SXGBE_CORE_RX_CTL2_REG 0x00A8 |
| 53 | #define SXGBE_CORE_RX_CTL3_REG 0x00AC | 53 | #define SXGBE_CORE_RX_CTL3_REG 0x00AC |
| 54 | 54 | ||
| 55 | #define SXGBE_CORE_RXQ_ENABLE_MASK 0x0003 | ||
| 56 | #define SXGBE_CORE_RXQ_ENABLE 0x0002 | ||
| 57 | #define SXGBE_CORE_RXQ_DISABLE 0x0000 | ||
| 58 | |||
| 55 | /* Interrupt Registers */ | 59 | /* Interrupt Registers */ |
| 56 | #define SXGBE_CORE_INT_STATUS_REG 0x00B0 | 60 | #define SXGBE_CORE_INT_STATUS_REG 0x00B0 |
| 57 | #define SXGBE_CORE_INT_ENABLE_REG 0x00B4 | 61 | #define SXGBE_CORE_INT_ENABLE_REG 0x00B4 |