diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-11 16:15:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-11 16:15:15 -0800 |
| commit | c41d40b53306434628b577715487810816fca885 (patch) | |
| tree | 83d0caf3cd2667f61d87aba6bf6e92857795e05d /arch/arm/mach-s5pv310/include/mach/map.h | |
| parent | a288465fa86731108c0ee590da505abe65480473 (diff) | |
| parent | a09e2b21cab92e98728c16f0e6f456f723dadf8b (diff) | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Ensure struct sys_device is declared in plat/pm.h
ARM: S5PV310: Cleanup System MMU
ARM: S5PV310: Add support System MMU on SMDKV310
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, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv310/include/mach/map.h b/arch/arm/mach-s5pv310/include/mach/map.h index 74d400625a23..3060f78e12ab 100644 --- a/arch/arm/mach-s5pv310/include/mach/map.h +++ b/arch/arm/mach-s5pv310/include/mach/map.h @@ -124,8 +124,6 @@ #define S5PV310_PA_SYSMMU_TV 0x12E20000 #define S5PV310_PA_SYSMMU_MFC_L 0x13620000 #define S5PV310_PA_SYSMMU_MFC_R 0x13630000 -#define S5PV310_SYSMMU_TOTAL_IPNUM 16 -#define S5P_SYSMMU_TOTAL_IPNUM S5PV310_SYSMMU_TOTAL_IPNUM /* compatibiltiy defines. */ #define S3C_PA_UART S5PV310_PA_UART |