diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:06 -0500 |
| commit | 8104a4775ad8a7863af0b898224b15aa708582db (patch) | |
| tree | 71380e4db36e9d91e521d0a98be74981e32a6700 /arch/cris/configs/artpec_3_defconfig | |
| parent | f6bbc1daac964da551130dbf01809d3fbd178b2d (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/cris/configs/artpec_3_defconfig')
| -rw-r--r-- | arch/cris/configs/artpec_3_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/configs/artpec_3_defconfig b/arch/cris/configs/artpec_3_defconfig index 590f72c9455d..71854d41c5a0 100644 --- a/arch/cris/configs/artpec_3_defconfig +++ b/arch/cris/configs/artpec_3_defconfig | |||
| @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y | |||
| 2 | # CONFIG_SWAP is not set | 2 | # CONFIG_SWAP is not set |
| 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_HOTPLUG is not set | 7 | # CONFIG_HOTPLUG is not set |
| 8 | # CONFIG_BLK_DEV_BSG is not set | 8 | # CONFIG_BLK_DEV_BSG is not set |