From: Olof Johansson <olof@lixom.net>
Date: Mon, 1 Oct 2012 21:34:39 +0000 (-0700)
Subject: Merge branch 'next/boards' into HEAD
X-Git-Tag: next-20121003~116^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5;p=karo-tx-linux.git

Merge branch 'next/boards' into HEAD

Conflicts:
	arch/arm/mach-shmobile/board-armadillo800eva.c
---

a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5
diff --cc arch/arm/mach-msm/Kconfig
index b2740c800e8c,03c549369ce3..7902de151cc5
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@@ -36,8 -40,12 +40,10 @@@ config ARCH_QSD8X5
  	select GPIO_MSM_V1
  	select MSM_PROC_COMM
  
+ endchoice
+ 
  config ARCH_MSM8X60
  	bool "MSM8X60"
 -	select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
 -				  && !MACH_MSM8X60_FFA)
  	select ARCH_MSM_SCORPIONMP
  	select ARM_GIC
  	select CPU_V7
@@@ -55,10 -63,7 +61,8 @@@ config ARCH_MSM896
  	select MSM_V2_TLMM
  	select MSM_GPIOMUX
  	select MSM_SCM if SMP
 +	select USE_OF
  
- endchoice
- 
  config MSM_HAS_DEBUG_UART_HS
  	bool
  
diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
index 45b33e02dff5,81dfb88ce813..9615a78d30b2
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@@ -902,8 -924,9 +925,9 @@@ static struct platform_device *eva_devi
  	&camera_device,
  	&ceu0_device,
  	&fsi_device,
 -	&fsi_hdmi_device,
  	&fsi_wm8978_device,
 +	&fsi_hdmi_device,
+ 	&i2c_gpio_device,
  };
  
  static void __init eva_clock_init(void)