summaryrefslogtreecommitdiff
path: root/arch/cris/configs/etraxfs_defconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-24 18:41:10 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-24 18:41:10 +0100
commit49c6ad430d74fb7995990be0f66165e4b94a6bc5 (patch)
tree9a0b4d5158cea625efd1f4185cdea79fe9f10d85 /arch/cris/configs/etraxfs_defconfig
parent233d84c46c2253d13e10b42d88c14748fbb67a98 (diff)
parent1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff)
Merge commit 'v2.6.38-rc2' into topic/misc
Diffstat (limited to 'arch/cris/configs/etraxfs_defconfig')
-rw-r--r--arch/cris/configs/etraxfs_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/configs/etraxfs_defconfig b/arch/cris/configs/etraxfs_defconfig
index f73d38cc9c66..87c7227fecb2 100644
--- a/arch/cris/configs/etraxfs_defconfig
+++ b/arch/cris/configs/etraxfs_defconfig
@@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_SWAP is not set
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
# CONFIG_KALLSYMS is not set
# CONFIG_HOTPLUG is not set
# CONFIG_BLK_DEV_BSG is not set