diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-28 04:19:15 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-28 04:19:15 +0400 |
commit | b521d929b330d665cb3a42b26eaaa5690dc9dad7 (patch) | |
tree | 7c1ddf1c06922c4728b6625fb10cf11de5a29387 /arch/arm/mach-tegra/include/mach/iomap.h | |
parent | 83b5938ce77bbbd9a04e5270ef2b3f17921bf0d4 (diff) | |
parent | d405e4b07a15b9d24d504a459295cf00a618c10c (diff) | |
download | linux-b521d929b330d665cb3a42b26eaaa5690dc9dad7.tar.xz |
Merge branch 'tegra/soc' into next/cleanup2
Conflicts:
arch/arm/mach-tegra/Makefile
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/iomap.h')
-rw-r--r-- | arch/arm/mach-tegra/include/mach/iomap.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/iomap.h b/arch/arm/mach-tegra/include/mach/iomap.h index c05b311ee4f7..2fd947259132 100644 --- a/arch/arm/mach-tegra/include/mach/iomap.h +++ b/arch/arm/mach-tegra/include/mach/iomap.h @@ -74,6 +74,9 @@ #define TEGRA_QUATERNARY_ICTLR_BASE 0x60004300 #define TEGRA_QUATERNARY_ICTLR_SIZE SZ_64 +#define TEGRA_QUINARY_ICTLR_BASE 0x60004400 +#define TEGRA_QUINARY_ICTLR_SIZE SZ_64 + #define TEGRA_TMR1_BASE 0x60005000 #define TEGRA_TMR1_SIZE SZ_8 |