summaryrefslogtreecommitdiff
path: root/arch/xtensa/configs/common_defconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-04 21:46:43 +0300
committerGrant Likely <grant.likely@secretlab.ca>2011-02-04 21:46:43 +0300
commitc64eae9a73a847c1698f913c893aa4012d2a30b0 (patch)
tree732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /arch/xtensa/configs/common_defconfig
parentc9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff)
parentebf53826e105f488f4f628703a108e98940d1dc5 (diff)
downloadlinux-c64eae9a73a847c1698f913c893aa4012d2a30b0.tar.xz
Merge commit 'v2.6.38-rc3' into devicetree/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