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/mpc30x_defconfig | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/mips/configs/mpc30x_defconfig')
| -rw-r--r-- | arch/mips/configs/mpc30x_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index 8c720e51795b..17203056b22b 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_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_MIPS_COBALT is not set | 12 | # CONFIG_MIPS_COBALT is not set |
| 14 | # CONFIG_MACH_DECSTATION is not set | 13 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 14 | # CONFIG_MACH_JAZZ is not set |
| @@ -817,7 +816,9 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 817 | # CONFIG_HEADERS_CHECK is not set | 816 | # CONFIG_HEADERS_CHECK is not set |
| 818 | # CONFIG_DEBUG_KERNEL is not set | 817 | # CONFIG_DEBUG_KERNEL is not set |
| 819 | CONFIG_CROSSCOMPILE=y | 818 | CONFIG_CROSSCOMPILE=y |
| 819 | CONFIG_CMDLINE_BOOL=y | ||
| 820 | CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73" | 820 | CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73" |
| 821 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
| 821 | 822 | ||
| 822 | # | 823 | # |
| 823 | # Security options | 824 | # Security options |