diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 19:16:43 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 19:16:43 +1000 |
| commit | 50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6 (patch) | |
| tree | c76f080377dd611857fa33f38a2b8a2af4576f8b /arch/arm/mach-dove/include/mach/bridge-regs.h | |
| parent | a8b91e43afd736fcebb0836359e5ddaeae45b2ab (diff) | |
| parent | 50fb31cfed9218b439360caf7c0399b00042da15 (diff) | |
| download | op-kernel-dev-50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6.zip op-kernel-dev-50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6.tar.gz | |
Merge branch 'merge' into next
We want to bring in the latest IRQ fixes
Diffstat (limited to 'arch/arm/mach-dove/include/mach/bridge-regs.h')
| -rw-r--r-- | arch/arm/mach-dove/include/mach/bridge-regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-dove/include/mach/bridge-regs.h b/arch/arm/mach-dove/include/mach/bridge-regs.h index 226949d..f953bb5 100644 --- a/arch/arm/mach-dove/include/mach/bridge-regs.h +++ b/arch/arm/mach-dove/include/mach/bridge-regs.h @@ -50,5 +50,6 @@ #define POWER_MANAGEMENT (BRIDGE_VIRT_BASE | 0x011c) #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300) +#define TIMER_PHYS_BASE (BRIDGE_PHYS_BASE | 0x0300) #endif |
