diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-17 12:27:37 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-17 12:28:05 -0500 |
commit | b7e56edba4b02f2079042c326a8cd72a44635817 (patch) | |
tree | b5042002e9747cd8fb1278d61f86d8b92a74c018 /arch/mips/configs/decstation_defconfig | |
parent | 13ca0fcaa33f6b1984c4111b6ec5df42689fea6f (diff) | |
parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) |
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/mips/configs/decstation_defconfig')
-rw-r--r-- | arch/mips/configs/decstation_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 9e65e6a2dcb3..cbb4d86f2912 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig | |||
@@ -22,7 +22,6 @@ CONFIG_ZONE_DMA=y | |||
22 | # CONFIG_MIPS_DB1550 is not set | 22 | # CONFIG_MIPS_DB1550 is not set |
23 | # CONFIG_MIPS_DB1200 is not set | 23 | # CONFIG_MIPS_DB1200 is not set |
24 | # CONFIG_MIPS_MIRAGE is not set | 24 | # CONFIG_MIPS_MIRAGE is not set |
25 | # CONFIG_BASLER_EXCITE is not set | ||
26 | # CONFIG_MIPS_COBALT is not set | 25 | # CONFIG_MIPS_COBALT is not set |
27 | CONFIG_MACH_DECSTATION=y | 26 | CONFIG_MACH_DECSTATION=y |
28 | # CONFIG_MACH_JAZZ is not set | 27 | # CONFIG_MACH_JAZZ is not set |
@@ -882,7 +881,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
882 | # CONFIG_DEBUG_KERNEL is not set | 881 | # CONFIG_DEBUG_KERNEL is not set |
883 | CONFIG_LOG_BUF_SHIFT=14 | 882 | CONFIG_LOG_BUF_SHIFT=14 |
884 | CONFIG_CROSSCOMPILE=y | 883 | CONFIG_CROSSCOMPILE=y |
885 | CONFIG_CMDLINE="" | 884 | # CONFIG_CMDLINE_BOOL is not set |
886 | 885 | ||
887 | # | 886 | # |
888 | # Security options | 887 | # Security options |