diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /arch/mips/configs/tb0226_defconfig | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/mips/configs/tb0226_defconfig')
| -rw-r--r-- | arch/mips/configs/tb0226_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index b06a716bf23f..e7c5cd32a2bd 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig | |||
| @@ -9,7 +9,6 @@ CONFIG_MIPS=y | |||
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_BASLER_EXCITE is not set | ||
| 13 | # CONFIG_BCM47XX is not set | 12 | # CONFIG_BCM47XX is not set |
| 14 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
| 15 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
| @@ -895,7 +894,9 @@ CONFIG_FRAME_WARN=1024 | |||
| 895 | # CONFIG_HEADERS_CHECK is not set | 894 | # CONFIG_HEADERS_CHECK is not set |
| 896 | # CONFIG_DEBUG_KERNEL is not set | 895 | # CONFIG_DEBUG_KERNEL is not set |
| 897 | # CONFIG_SAMPLES is not set | 896 | # CONFIG_SAMPLES is not set |
| 897 | CONFIG_CMDLINE_BOOL=y | ||
| 898 | CONFIG_CMDLINE="cca=3 mem=32M console=ttyVR0,115200" | 898 | CONFIG_CMDLINE="cca=3 mem=32M console=ttyVR0,115200" |
| 899 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
| 899 | 900 | ||
| 900 | # | 901 | # |
| 901 | # Security options | 902 | # Security options |