The following commit has been merged in the linux branch: commit c70887555143fdede9595df4c7a598676922f107 Author: Ralf Baechle ralf@linux-mips.org Date: Mon Oct 12 22:30:06 2009 +0200
MIPS: Kconfig: Fix duplicate default value for MIPS_L1_CACHE_SHIFT.
Signed-off-by: Ralf Baechle ralf@linux-mips.org
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 705a7a9..7159495 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1012,9 +1012,8 @@ config BOOT_ELF32
config MIPS_L1_CACHE_SHIFT int - default "4" if MACH_DECSTATION || MIKROTIK_RB532 + default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON - default "4" if PMC_MSP4200_EVAL default "5"
config HAVE_STD_PC_SERIAL_PORT