diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-24 22:17:06 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-24 22:17:06 +0100 |
commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /arch/xtensa/configs/iss_defconfig | |
parent | net: arp_ioctl() must hold RTNL (diff) | |
parent | fix a shutdown regression in intel_idle (diff) | |
download | linux-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_defconfig | 2 |
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 |