diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 14:05:56 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:35:42 +0200 |
commit | 14d597b74aed3c44af0ee8f5ea24b970a50aec99 (patch) | |
tree | 7cd25aa0621ccc82dd2b613656e74aacdf4afdde /arch/arm/mach-dove/include/mach/dove.h | |
parent | Merge branch 'for-3.6/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt (diff) | |
parent | Linux 3.5-rc6 (diff) | |
download | linux-dev-14d597b74aed3c44af0ee8f5ea24b970a50aec99.tar.xz linux-dev-14d597b74aed3c44af0ee8f5ea24b970a50aec99.zip |
Merge tag 'v3.5-rc6' into next/dt
New pull requests are based on Linux 3.5-rc6
Diffstat (limited to 'arch/arm/mach-dove/include/mach/dove.h')
-rw-r--r-- | arch/arm/mach-dove/include/mach/dove.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-dove/include/mach/dove.h b/arch/arm/mach-dove/include/mach/dove.h index ad1165d488c1..d52b0ef313b7 100644 --- a/arch/arm/mach-dove/include/mach/dove.h +++ b/arch/arm/mach-dove/include/mach/dove.h @@ -78,6 +78,7 @@ /* North-South Bridge */ #define BRIDGE_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0x20000) +#define BRIDGE_PHYS_BASE (DOVE_SB_REGS_PHYS_BASE | 0x20000) /* Cryptographic Engine */ #define DOVE_CRYPT_PHYS_BASE (DOVE_SB_REGS_PHYS_BASE | 0x30000) |