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/mn10300/configs/asb2364_defconfig | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'arch/mn10300/configs/asb2364_defconfig')
| -rw-r--r-- | arch/mn10300/configs/asb2364_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/configs/asb2364_defconfig b/arch/mn10300/configs/asb2364_defconfig index 83ce2f27b12a..31d76261a3d5 100644 --- a/arch/mn10300/configs/asb2364_defconfig +++ b/arch/mn10300/configs/asb2364_defconfig | |||
| @@ -15,7 +15,7 @@ CONFIG_CGROUP_CPUACCT=y | |||
| 15 | CONFIG_RESOURCE_COUNTERS=y | 15 | CONFIG_RESOURCE_COUNTERS=y |
| 16 | CONFIG_RELAY=y | 16 | CONFIG_RELAY=y |
| 17 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 17 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 18 | CONFIG_EMBEDDED=y | 18 | CONFIG_EXPERT=y |
| 19 | # CONFIG_KALLSYMS is not set | 19 | # CONFIG_KALLSYMS is not set |
| 20 | # CONFIG_VM_EVENT_COUNTERS is not set | 20 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 21 | CONFIG_SLAB=y | 21 | CONFIG_SLAB=y |