linux-next: manual merge of the tegra tree with the arm and s5p trees
in [Kernel]
|
Prev: linux-next: manual merge of the tegra tree with the s5p tree
Next: drivers/net/bfin_mac.c: Misc function cleanups, neatening
From: Stephen Rothwell on 29 Jul 2010 21:00 Hi all, Today's linux-next merge of the tegra tree got a conflict in arch/arm/Kconfig between various commits from the arm and s5p trees and commits 2d2996d53fd5643816d8ab4fa07e2e76c38bdc0c ("[ARM] tegra: SMP support") from the tegra tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc arch/arm/Kconfig index 63daf56,1341628..0000000 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -1122,11 -1114,11 +1136,11 @@@ config SM bool "Symmetric Multi-Processing (EXPERIMENTAL)" depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\ MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\ - ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310) - ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA) ++ ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310 || ARCH_TEGRA) depends on GENERIC_CLOCKEVENTS select USE_GENERIC_SMP_HELPERS - select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\ - ARCH_S5PV310) + select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || \ - ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA) ++ ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310 || ARCH_TEGRA) help This enables support for systems with more than one CPU. If you have a system with only one CPU, like most personal computers, say N. If @@@ -1196,9 -1188,10 +1210,9 @@@ config LOCAL_TIMER bool "Use local timer interrupts" depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \ REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \ - ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310) - ARCH_U8500 || ARCH_TEGRA) ++ ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310 || ARCH_TEGRA) default y - select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500 || ARCH_S5PV310) - select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || \ - ARCH_TEGRA) ++ select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500 || ARCH_S5PV310 || ARCH_TEGRA) help Enable support for local timers on SMP platforms, rather then the legacy IPI broadcast method. Local timers allows the system -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |