summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/configs/iss_defconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-24 22:17:06 +0100
committerDavid S. Miller <davem@davemloft.net>2011-01-24 22:17:06 +0100
commite92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch)
tree6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /arch/xtensa/configs/iss_defconfig
parentnet: arp_ioctl() must hold RTNL (diff)
parentfix a shutdown regression in intel_idle (diff)
downloadlinux-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.tar.xz
linux-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/xtensa/configs/iss_defconfig')
-rw-r--r--arch/xtensa/configs/iss_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
index 7368164843b9..0234cd198c54 100644
--- a/arch/xtensa/configs/iss_defconfig
+++ b/arch/xtensa/configs/iss_defconfig
@@ -55,7 +55,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set