diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 21:14:43 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 21:14:43 +0200 |
commit | eedd52e3c462d5434412fd0b7bc183ed76d3a4a8 (patch) | |
tree | 60d239a229673658b38dcb949286ad45a4a89167 /arch/arm/plat-s5p/Kconfig | |
parent | 030caf3f22395d564ee8a4f056a9cb7190a7eed4 (diff) | |
parent | bca10b906f8d2e4f177bff047b9d623941e454f7 (diff) | |
download | blackbird-op-linux-eedd52e3c462d5434412fd0b7bc183ed76d3a4a8.tar.gz blackbird-op-linux-eedd52e3c462d5434412fd0b7bc183ed76d3a4a8.zip |
Merge branch 'exynos/sysmmu' into next/cleanup2
Required as a depdency for the next/cleanup-plat-s3c24xx-s5p branch
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-s5p/Kconfig')
-rw-r--r-- | arch/arm/plat-s5p/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index 96bea3202304..2c1193c59928 100644 --- a/arch/arm/plat-s5p/Kconfig +++ b/arch/arm/plat-s5p/Kconfig @@ -50,14 +50,6 @@ config S5P_PM Common code for power management support on S5P and newer SoCs Note: Do not select this for S5P6440 and S5P6450. -comment "System MMU" - -config S5P_SYSTEM_MMU - bool "S5P SYSTEM MMU" - depends on ARCH_EXYNOS4 - help - Say Y here if you want to enable System MMU - config S5P_SLEEP bool help |