summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/83xx/sbc834x_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/powerpc/configs/83xx/sbc834x_defconfig
parentMAINTAINERS: fix sorting (diff)
parentklist: Fix object alignment on 64-bit. (diff)
downloadlinux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.xz
linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.zip
Merge branch 'master' into for-next
Diffstat (limited to 'arch/powerpc/configs/83xx/sbc834x_defconfig')
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index fa5c9eefc9ad..6d6463fe06fc 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -3,7 +3,7 @@ CONFIG_SYSVIPC=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_BLK_DEV_INITRD=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
# CONFIG_KALLSYMS is not set
CONFIG_SLAB=y
CONFIG_MODULES=y