summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/spitz_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/arm/configs/spitz_defconfig
parent557218e2d662574bc58d840fe116c7fd8d57aed8 (diff)
parent78bba987bc025a7263248501b453476e77b93331 (diff)
downloadtalos-op-linux-c170093d31bd4e3bc51881cc0f123beeca7872c9.tar.gz
talos-op-linux-c170093d31bd4e3bc51881cc0f123beeca7872c9.zip
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'arch/arm/configs/spitz_defconfig')
-rw-r--r--arch/arm/configs/spitz_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig
index aebd4bb0ad01..70158273c6dd 100644
--- a/arch/arm/configs/spitz_defconfig
+++ b/arch/arm/configs/spitz_defconfig
@@ -4,7 +4,7 @@ CONFIG_BSD_PROCESS_ACCT=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED_V2=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
CONFIG_MODULES=y
OpenPOWER on IntegriCloud