summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/bigsur_defconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-12 23:53:34 -0700
committerGrant Likely <grant.likely@secretlab.ca>2011-02-12 23:53:34 -0700
commitc170093d31bd4e3bc51881cc0f123beeca7872c9 (patch)
treed93cd280d525dd339f33be010c75b7fd0bacd690 /arch/mips/configs/bigsur_defconfig
parent557218e2d662574bc58d840fe116c7fd8d57aed8 (diff)
parent78bba987bc025a7263248501b453476e77b93331 (diff)
downloadtalos-obmc-linux-c170093d31bd4e3bc51881cc0f123beeca7872c9.tar.gz
talos-obmc-linux-c170093d31bd4e3bc51881cc0f123beeca7872c9.zip
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'arch/mips/configs/bigsur_defconfig')
-rw-r--r--arch/mips/configs/bigsur_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 9749bc8758db..1cdff6b6327d 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -26,7 +26,7 @@ CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_BLK_DEV_INITRD=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
# CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_SLAB=y
OpenPOWER on IntegriCloud