diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-29 20:44:13 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-29 20:44:13 -0500 |
| commit | 724c35cf530651f68f5958dc02e0b49ac6661226 (patch) | |
| tree | 7511b55f0efc07495a559f48b3071a34f0bfaff3 /arch/arm/mach-s5p64x0 | |
| parent | 57ca51514905b7aea532977e4e87e989d33bfcbb (diff) | |
| parent | 3bbef1b912df64a86a86e402d7686a8ed38abaf4 (diff) | |
Merge branch 'next-s5p' into for-next-new
Diffstat (limited to 'arch/arm/mach-s5p64x0')
| -rw-r--r-- | arch/arm/mach-s5p64x0/include/mach/map.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p64x0/include/mach/map.h b/arch/arm/mach-s5p64x0/include/mach/map.h index 4d3d332152d0..a9365e5ba614 100644 --- a/arch/arm/mach-s5p64x0/include/mach/map.h +++ b/arch/arm/mach-s5p64x0/include/mach/map.h | |||
| @@ -29,6 +29,9 @@ | |||
| 29 | #define S5P64X0_PA_VIC0 (0xE4000000) | 29 | #define S5P64X0_PA_VIC0 (0xE4000000) |
| 30 | #define S5P64X0_PA_VIC1 (0xE4100000) | 30 | #define S5P64X0_PA_VIC1 (0xE4100000) |
| 31 | 31 | ||
| 32 | #define S5P64X0_PA_SROMC (0xE7000000) | ||
| 33 | #define S5P_PA_SROMC S5P64X0_PA_SROMC | ||
| 34 | |||
| 32 | #define S5P64X0_PA_PDMA (0xE9000000) | 35 | #define S5P64X0_PA_PDMA (0xE9000000) |
| 33 | 36 | ||
| 34 | #define S5P64X0_PA_TIMER (0xEA000000) | 37 | #define S5P64X0_PA_TIMER (0xEA000000) |