diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /arch/mips/configs/mipssim_defconfig | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/mips/configs/mipssim_defconfig')
| -rw-r--r-- | arch/mips/configs/mipssim_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig index 7358454deaa6..f77a34e0f938 100644 --- a/arch/mips/configs/mipssim_defconfig +++ b/arch/mips/configs/mipssim_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 |
| @@ -635,7 +634,9 @@ CONFIG_FORCED_INLINING=y | |||
| 635 | # CONFIG_RCU_TORTURE_TEST is not set | 634 | # CONFIG_RCU_TORTURE_TEST is not set |
| 636 | # CONFIG_FAULT_INJECTION is not set | 635 | # CONFIG_FAULT_INJECTION is not set |
| 637 | CONFIG_CROSSCOMPILE=y | 636 | CONFIG_CROSSCOMPILE=y |
| 637 | CONFIG_CMDLINE_BOOL=y | ||
| 638 | CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp" | 638 | CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp" |
| 639 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
| 639 | # CONFIG_DEBUG_STACK_USAGE is not set | 640 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 640 | # CONFIG_RUNTIME_DEBUG is not set | 641 | # CONFIG_RUNTIME_DEBUG is not set |
| 641 | 642 | ||