diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-31 02:52:05 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-31 02:52:05 +0100 |
| commit | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 (patch) | |
| tree | fa15cd1b385898f01ead4649712f6e4fbcd055cd /arch/arm/mach-s5pv310/include/mach/map.h | |
| parent | Merge branch 'next-s5pv210' into for-next-new (diff) | |
| parent | Merge branch 'dev/s5pv310-irq' into next-s5pv310 (diff) | |
| download | linux-285dee7ff4fb4b32838694d4378f4aa938cf5b43.tar.xz linux-285dee7ff4fb4b32838694d4378f4aa938cf5b43.zip | |
Merge branch 'next-s5pv310' into for-next
Conflicts:
arch/arm/mach-s5pv310/Kconfig
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/mach-smdkc210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/plat-samsung/include/plat/devs.h
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 0d0e7eb5b391..44af3e821da2 100644 --- a/arch/arm/mach-s5pv310/include/mach/map.h +++ b/arch/arm/mach-s5pv310/include/mach/map.h @@ -39,6 +39,8 @@ #define S5PV310_PA_SYSCON (0x10010000) #define S5P_PA_SYSCON S5PV310_PA_SYSCON +#define S5PV310_PA_PMU (0x10020000) + #define S5PV310_PA_CMU (0x10030000) #define S5PV310_PA_WATCHDOG (0x10060000) |