diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:44:13 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:44:13 +0900 |
commit | 724c35cf530651f68f5958dc02e0b49ac6661226 (patch) | |
tree | 7511b55f0efc07495a559f48b3071a34f0bfaff3 /arch/arm/mach-s5pc100 | |
parent | 57ca51514905b7aea532977e4e87e989d33bfcbb (diff) | |
parent | 3bbef1b912df64a86a86e402d7686a8ed38abaf4 (diff) | |
download | linux-724c35cf530651f68f5958dc02e0b49ac6661226.tar.gz linux-724c35cf530651f68f5958dc02e0b49ac6661226.tar.bz2 linux-724c35cf530651f68f5958dc02e0b49ac6661226.zip |
Merge branch 'next-s5p' into for-next-new
Diffstat (limited to 'arch/arm/mach-s5pc100')
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/map.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h index 32e9cab5c864..328467b346aa 100644 --- a/arch/arm/mach-s5pc100/include/mach/map.h +++ b/arch/arm/mach-s5pc100/include/mach/map.h @@ -55,6 +55,8 @@ #define S5PC100_VA_VIC_OFFSET 0x10000 #define S5PC1XX_VA_VIC(x) (S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET)) +#define S5PC100_PA_SROMC (0xE7000000) +#define S5P_PA_SROMC S5PC100_PA_SROMC #define S5PC100_PA_ONENAND (0xE7100000) |