diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-01-13 03:58:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-13 04:08:50 -0500 |
| commit | 61405fea92c42d072d9b8bd189689f1502a838af (patch) | |
| tree | 013ea3e7ed71f4114004d5852d40b6e89e128f76 /arch/mips/configs/ip32_defconfig | |
| parent | 9c443dfdd31eddea6cbe6ee0ca469fbcc4e1dc3b (diff) | |
| parent | 1703f2c321a8a531c393e137a82602e16c6061cb (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: queue up dependent patch, update to -rc4
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/configs/ip32_defconfig')
| -rw-r--r-- | arch/mips/configs/ip32_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index d934bdefb393..1841c88d3d24 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_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 |
| @@ -1126,7 +1125,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 1126 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1125 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
| 1127 | # CONFIG_SAMPLES is not set | 1126 | # CONFIG_SAMPLES is not set |
| 1128 | CONFIG_HAVE_ARCH_KGDB=y | 1127 | CONFIG_HAVE_ARCH_KGDB=y |
| 1129 | CONFIG_CMDLINE="" | 1128 | # CONFIG_CMDLINE_BOOL is not set |
| 1130 | 1129 | ||
| 1131 | # | 1130 | # |
| 1132 | # Security options | 1131 | # Security options |