From: Russell King Date: Thu, 26 Mar 2009 23:10:11 +0000 (+0000) Subject: Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel X-Git-Tag: v2.6.30-rc1~636^2~5 X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=542f869f1826f092606efd0c4c771f070d1314f5 Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel Conflicts: arch/arm/mm/Kconfig Signed-off-by: Russell King --- 542f869f1826f092606efd0c4c771f070d1314f5 diff --cc arch/arm/Makefile index 95186ef,56e13bf..e84729b --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@@ -109,10 -106,9 +110,11 @@@ ifeq ($(CONFIG_ARCH_SA1100),y textofs-$(CONFIG_SA1111) := 0x00208000 endif machine-$(CONFIG_ARCH_PXA) := pxa + machine-$(CONFIG_ARCH_MMP) := mmp + plat-$(CONFIG_PLAT_PXA) := pxa machine-$(CONFIG_ARCH_L7200) := l7200 machine-$(CONFIG_ARCH_INTEGRATOR) := integrator + machine-$(CONFIG_ARCH_GEMINI) := gemini textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000 machine-$(CONFIG_ARCH_CLPS711X) := clps711x machine-$(CONFIG_ARCH_IOP32X) := iop32x diff --cc arch/arm/mm/Kconfig index a6230f7,bc333186..2097956 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@@ -664,7 -684,7 +695,7 @@@ config CPU_CACHE_ROUND_ROBI config CPU_BPREDICT_DISABLE bool "Disable branch prediction" - depends on CPU_ARM1020 || CPU_V6 || CPU_MOHAWK || CPU_XSC3 || CPU_V7 - depends on CPU_ARM1020 || CPU_V6 || CPU_XSC3 || CPU_V7 || CPU_FA526 ++ depends on CPU_ARM1020 || CPU_V6 || CPU_MOHAWK || CPU_XSC3 || CPU_V7 || CPU_FA526 help Say Y here to disable branch prediction. If unsure, say N.