From: Simon Horman <horms@verge.net.au>
Date: Thu, 6 Sep 2012 01:55:52 +0000 (+0900)
Subject: Merge branches 'cleanup', 'dt', 'soc', 'boards', 'defconfig', 'armadillo800eva-fixes... 
X-Git-Tag: next-20120907~8^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5a38a49a494e5c6b4ba139d8a2c951aae78c73a5;p=karo-tx-linux.git

Merge branches 'cleanup', 'dt', 'soc', 'boards', 'defconfig', 'armadillo800eva-fixes' and 'fixes' into next
---

5a38a49a494e5c6b4ba139d8a2c951aae78c73a5
diff --cc arch/arm/configs/marzen_defconfig
index 864f9a5c39dd,864f9a5c39dd,864f9a5c39dd,f513acedc10a,737e49890db5,864f9a5c39dd,864f9a5c39dd..53382b6c8bb4
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@@@@@@@ -68,9 -68,9 -68,9 -68,11 -71,10 -68,9 -68,9 +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