Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/pub/scm...

[mv-sheeva.git] / arch / sh / configs / se7206_defconfig

diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index a468ff227fc6503c13fec6e3ab8e310aace0b876..72c3fad7383f5fc254d90fe3d499eb4a61ce1a47 100644 (file)
--- a/arch/sh/configs/se7206_defconfig
+++ b/arch/sh/configs/se7206_defconfig
@@ -8,7 +8,6 @@ CONFIG_RCU_TRACE=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y