summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/ep93xx_defconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-02-15 10:24:31 +0100
committerJiri Kosina <jkosina@suse.cz>2011-02-15 10:24:31 +0100
commit0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch)
treedf997d1cfb0786427a0df1fbd6f0640fa4248cf4 /arch/arm/configs/ep93xx_defconfig
parenta23ce6da9677d245aa0aadc99f4197030350ab54 (diff)
parent795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff)
downloadop-kernel-dev-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.zip
op-kernel-dev-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.gz
Merge branch 'master' into for-next
Diffstat (limited to 'arch/arm/configs/ep93xx_defconfig')
-rw-r--r--arch/arm/configs/ep93xx_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig
index 6d6689c..8e97b2f 100644
--- a/arch/arm/configs/ep93xx_defconfig
+++ b/arch/arm/configs/ep93xx_defconfig
@@ -4,7 +4,7 @@ CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
OpenPOWER on IntegriCloud