diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-06 03:42:55 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-06 03:42:55 -0500 |
| commit | 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (patch) | |
| tree | c815434adc34cb7274ef6a0ee16cf8491fa0c03e /arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | |
| parent | 0fff6b9a4e0aba233a2ff644316d29b0cb784e33 (diff) | |
| parent | 53936c56dcaf1db818fe953ae05592a8b5e345b5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
Diffstat (limited to 'arch/arm/mach-mv78xx0/include/mach/bridge-regs.h')
| -rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h b/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h index 2d14c4fe294d..c64dbb96dbad 100644 --- a/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h +++ b/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | |||
| @@ -20,10 +20,6 @@ | |||
| 20 | #define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c) | 20 | #define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c) |
| 21 | #define SOFT_RESET 0x00000001 | 21 | #define SOFT_RESET 0x00000001 |
| 22 | 22 | ||
| 23 | #define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110) | ||
| 24 | #define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114) | ||
| 25 | #define BRIDGE_INT_TIMER0 0x0002 | ||
| 26 | #define BRIDGE_INT_TIMER1 0x0004 | ||
| 27 | #define BRIDGE_INT_TIMER1_CLR (~0x0004) | 23 | #define BRIDGE_INT_TIMER1_CLR (~0x0004) |
| 28 | 24 | ||
| 29 | #define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200) | 25 | #define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200) |