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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 4 May 2010 11:07:25 +1000

Hi Daniel,

Today's linux-next merge of the msm tree got a conflict in
arch/arm/mach-msm/Kconfig between commit
4b53eb4f5d78416456bb969ce30e3bed2731d744 ("arm: msm: allow ARCH_MSM to
have v7 cpus") from the arm tree and commit
e17047ea51cc2eac3e920e5a669f99efd44f446f ("arm: msm: smd: use either
package v3 or v4 not both") from the msm tree.

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

diff --cc arch/arm/mach-msm/Kconfig
index b9fd5c5,69cc693..0000000
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@@ -28,15 -45,14 +45,16 @@@ choic
  endchoice
  
  config MACH_HALIBUT
- 	depends on ARCH_MSM
+ 	depends on ARCH_MSM7X00A
 +	select CPU_V6
  	default y
  	bool "Halibut Board (QCT SURF7201A)"
  	help
  	  Support for the Qualcomm SURF7201A eval board.
  
  config MACH_TROUT
+ 	depends on ARCH_MSM7X00A
 +	select CPU_V6
  	default y
  	bool "HTC Dream (aka trout)"
  	help