linux-next: manual merge of the tegra tree with the arm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/Kconfig between commit bde28b846e7e0ea6fea78f6ad1c43091fdf4d3e0
("ARM: 6218/1: Versatile Express: add support for local timers on CA9X4
daughterboard") from the arm tree and commit
c9dfc86214ffc3bcd0155b38bfe04383accc054a ("[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@xxxxxxxxxxxxxxxx

diff --cc arch/arm/Kconfig
index 7e73d07,c8f28f8..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1155,9 -1187,10 +1170,10 @@@ 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_U8500 || ARCH_TEGRA)
++		ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
  	default y
- 	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500)
 -	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || \
++	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500 || \
+ 		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-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux