Subject: linux-next: manual merge of the arm tree with the arm-current tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 6 May 2009 11:32:33 +1000

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/Kconfig between commit 9abf137c6dbf6eabb3add98fcd8352c3dd520568
("ARM: ARCH_MXC should select HAVE_CLK") from the arm-current tree and
commit 788c9700e7855f8a8cc8875e30d2518b57385c20 ("[ARM] Kconfig: sort ARM
machine class support choice list by option name") from the arm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/arm/Kconfig
index e60ec54,01cb452..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -292,6 -292,29 +292,30 @@@ config ARCH_FOOTBRIDG
  	  Support for systems based on the DC21285 companion chip
  	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
  
+ config ARCH_MXC
+ 	bool "Freescale MXC/iMX-based"
+ 	select GENERIC_TIME
+ 	select GENERIC_CLOCKEVENTS
+ 	select ARCH_MTD_XIP
+ 	select GENERIC_GPIO
+ 	select ARCH_REQUIRE_GPIOLIB
++	select HAVE_CLK
+ 	help
+ 	  Support for Freescale MXC/iMX-based family of processors
+ 
+ config ARCH_STMP3XXX
+ 	bool "Freescale STMP3xxx"
+ 	select CPU_ARM926T
+ 	select HAVE_CLK
+ 	select COMMON_CLKDEV
+ 	select ARCH_REQUIRE_GPIOLIB
+ 	select GENERIC_TIME
+ 	select GENERIC_CLOCKEVENTS
+ 	select GENERIC_GPIO
+ 	select USB_ARCH_HAS_EHCI
+ 	help
+ 	  Support for systems based on the Freescale 3xxx CPUs.
+ 
  config ARCH_NETX
  	bool "Hilscher NetX based"
  	select CPU_ARM926T