summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/configs/common_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/xtensa/configs/common_defconfig
parenta23ce6da9677d245aa0aadc99f4197030350ab54 (diff)
parent795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff)
downloadtalos-op-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.gz
talos-op-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.zip
Merge branch 'master' into for-next
Diffstat (limited to 'arch/xtensa/configs/common_defconfig')
-rw-r--r--arch/xtensa/configs/common_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/configs/common_defconfig b/arch/xtensa/configs/common_defconfig
index 1d230ee081b4..b90038e40dd3 100644
--- a/arch/xtensa/configs/common_defconfig
+++ b/arch/xtensa/configs/common_defconfig
@@ -32,7 +32,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_HOTPLUG is not set
CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
+# CONFIG_EXPERT is not set
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_EXTRA_PASS is not set
OpenPOWER on IntegriCloud