linux-next: manual merge of the genesis tree with the arm and samsung trees

linux-next: manual merge of the genesis tree with the arm and samsung trees

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the genesis tree got a conflict in
arch/arm/Kconfig between commits c4ffccddd54b669cc9683f2c69e31035e916a1a0
("ARM: S5P6440: Add new Kconfig and Makefiles") from the arm tree and
550db7f155c9e51288fbe114fbb33d7a044d8a75 ("ARM: S5P6442: Update Kconfig
and Makefiles") from the samsung and commit
c793c1b0c8ea11b46caf5a532752214b27a2df42 ("ARM: mach-shmobile: SH-Mobile
G3 support") from the genesis tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/Kconfig
index 8aff2a0,55764a1..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -616,12 -579,16 +616,17 @@@ config ARCH_MS
  	select GENERIC_TIME
  	select GENERIC_CLOCKEVENTS
  	help
 -	  Support for Qualcomm MSM7K based systems.  This runs on the ARM11
 -	  apps processor of the MSM7K and depends on a shared memory
 -	  interface to the ARM9 modem processor which runs the baseband stack
 -	  and controls some vital subsystems (clock and power control, etc).
 +	  Support for Qualcomm MSM/QSD based systems.  This runs on the
 +	  apps processor of the MSM/QSD and depends on a shared memory
 +	  interface to the modem processor which runs the baseband
 +	  stack and controls some vital subsystems
 +	  (clock and power control, etc).
  
+ config ARCH_SHMOBILE
+ 	bool "Renesas SH-Mobile"
+ 	help
+ 	  Support for Renesas's SH-Mobile ARM platforms
+ 
  config ARCH_RPC
  	bool "RiscPC"
  	select ARCH_ACORN
@@@ -887,13 -823,12 +892,15 @@@ source "arch/arm/mach-s3c2443/Kconfig
  endif
  
  if ARCH_S3C64XX
 -source "arch/arm/mach-s3c6400/Kconfig"
 -source "arch/arm/mach-s3c6410/Kconfig"
 +source "arch/arm/mach-s3c64xx/Kconfig"
  endif
  
 +source "arch/arm/mach-s5p6440/Kconfig"
 +
 +source "arch/arm/mach-s5p6442/Kconfig"
 +
+ source "arch/arm/mach-shmobile/Kconfig"
+ 
  source "arch/arm/plat-stmp3xxx/Kconfig"
  
  if ARCH_S5PC1XX