diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /arch/arm/configs/eseries_pxa_defconfig | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'arch/arm/configs/eseries_pxa_defconfig')
| -rw-r--r-- | arch/arm/configs/eseries_pxa_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig index 1691dea582f..d68ac67c201 100644 --- a/arch/arm/configs/eseries_pxa_defconfig +++ b/arch/arm/configs/eseries_pxa_defconfig | |||
| @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y | |||
| 2 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 3 | CONFIG_LOG_BUF_SHIFT=14 | 3 | CONFIG_LOG_BUF_SHIFT=14 |
| 4 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 4 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 5 | CONFIG_EMBEDDED=y | 5 | CONFIG_EXPERT=y |
| 6 | # CONFIG_KALLSYMS is not set | 6 | # CONFIG_KALLSYMS is not set |
| 7 | # CONFIG_COMPAT_BRK is not set | 7 | # CONFIG_COMPAT_BRK is not set |
| 8 | CONFIG_SLAB=y | 8 | CONFIG_SLAB=y |