aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/adder875_defconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-13 01:53:34 -0500
committerGrant Likely <grant.likely@secretlab.ca>2011-02-13 01:53:34 -0500
commitc170093d31bd4e3bc51881cc0f123beeca7872c9 (patch)
treed93cd280d525dd339f33be010c75b7fd0bacd690 /arch/powerpc/configs/adder875_defconfig
parent557218e2d662574bc58d840fe116c7fd8d57aed8 (diff)
parent78bba987bc025a7263248501b453476e77b93331 (diff)
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'arch/powerpc/configs/adder875_defconfig')
-rw-r--r--arch/powerpc/configs/adder875_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig
index ca84c7fc24d5..69128740c14d 100644
--- a/arch/powerpc/configs/adder875_defconfig
+++ b/arch/powerpc/configs/adder875_defconfig
@@ -4,7 +4,7 @@ CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
5CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EMBEDDED=y 7CONFIG_EXPERT=y
8# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_ELF_CORE is not set 9# CONFIG_ELF_CORE is not set
10# CONFIG_BASE_FULL is not set 10# CONFIG_BASE_FULL is not set