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/blackfin/configs/TCM-BF537_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/blackfin/configs/TCM-BF537_defconfig')
| -rw-r--r-- | arch/blackfin/configs/TCM-BF537_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/TCM-BF537_defconfig b/arch/blackfin/configs/TCM-BF537_defconfig index 00ce899e9e5d..65f642167a50 100644 --- a/arch/blackfin/configs/TCM-BF537_defconfig +++ b/arch/blackfin/configs/TCM-BF537_defconfig | |||
| @@ -8,7 +8,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 8 | # CONFIG_RD_GZIP is not set | 8 | # CONFIG_RD_GZIP is not set |
| 9 | CONFIG_RD_LZMA=y | 9 | CONFIG_RD_LZMA=y |
| 10 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 10 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 11 | CONFIG_EMBEDDED=y | 11 | CONFIG_EXPERT=y |
| 12 | # CONFIG_UID16 is not set | 12 | # CONFIG_UID16 is not set |
| 13 | # CONFIG_SYSCTL_SYSCALL is not set | 13 | # CONFIG_SYSCTL_SYSCALL is not set |
| 14 | # CONFIG_ELF_CORE is not set | 14 | # CONFIG_ELF_CORE is not set |