From: Simon Horman <horms@verge.net.au>
Date: Tue, 18 Sep 2012 02:27:33 +0000 (+0900)
Subject: Merge branch 'heads/boards' into next
X-Git-Tag: next-20120919~9^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2e2e9d5645becf6e519a4023721de39481258df8;p=karo-tx-linux.git

Merge branch 'heads/boards' into next

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

2e2e9d5645becf6e519a4023721de39481258df8
diff --cc arch/arm/configs/marzen_defconfig
index 737e49890db5,f513acedc10a..53382b6c8bb4
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@@ -71,10 -68,11 +71,12 @@@ CONFIG_SERIAL_SH_SCI_CONSOLE=
  # CONFIG_HW_RANDOM is not set
  CONFIG_GPIO_SYSFS=y
  # CONFIG_HWMON is not set
+ CONFIG_THERMAL=y
+ CONFIG_RCAR_THERMAL=y
  CONFIG_SSB=y
 -# CONFIG_HID_SUPPORT is not set
  # CONFIG_USB_SUPPORT is not set
 +CONFIG_MMC=y
 +CONFIG_MMC_SDHI=y
  CONFIG_UIO=y
  CONFIG_UIO_PDRV_GENIRQ=y
  # CONFIG_IOMMU_SUPPORT is not set
diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
index 453a6e50db8b,81dfb88ce813..cd79119d8229
--- 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)