diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 18:59:54 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 18:59:54 +0900 |
| commit | c6906c3e29a4a28660f70421935c91cf6b8ab1e1 (patch) | |
| tree | 40d97bdc21b95788ab24a4824c769b9dbe9b602b /arch/arm/mach-s5pv310/include/mach/map.h | |
| parent | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 (diff) | |
| parent | 8267e2e0fba74a944f9d0c9afd7779eb7272f5e7 (diff) | |
| download | kernel_samsung_smdk4412-c6906c3e29a4a28660f70421935c91cf6b8ab1e1.zip kernel_samsung_smdk4412-c6906c3e29a4a28660f70421935c91cf6b8ab1e1.tar.gz kernel_samsung_smdk4412-c6906c3e29a4a28660f70421935c91cf6b8ab1e1.tar.bz2 | |
Merge branch 'next-s5pv310' into for-next
Conflicts:
arch/arm/mach-s5pv310/Makefile
Diffstat (limited to 'arch/arm/mach-s5pv310/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-s5pv310/include/mach/map.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/include/mach/map.h b/arch/arm/mach-s5pv310/include/mach/map.h index 44af3e8..33bcff2 100644 --- a/arch/arm/mach-s5pv310/include/mach/map.h +++ b/arch/arm/mach-s5pv310/include/mach/map.h @@ -46,6 +46,8 @@ #define S5PV310_PA_WATCHDOG (0x10060000) #define S5PV310_PA_RTC (0x10070000) +#define S5PV310_PA_DMC0 (0x10400000) + #define S5PV310_PA_COMBINER (0x10448000) #define S5PV310_PA_COREPERI (0x10500000) |