From: Simon Horman <horms@verge.net.au>
Date: Thu, 8 Nov 2012 08:54:41 +0000 (+0900)
Subject: Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/soc2' into next
X-Git-Tag: next-20121109~21^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=07efb0cceccf6d360bdbd6806e1308dd5998065b;p=karo-tx-linux.git

Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/soc2' into next
---

07efb0cceccf6d360bdbd6806e1308dd5998065b
diff --cc arch/arm/configs/kzm9g_defconfig
index c88b57886e79,b377a6f2c1c1,ce99e3e00efa..afbae287436b
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@@@ -119,8 -119,7 -121,10 +121,9 @@@@ CONFIG_DMADEVICES=
   CONFIG_SH_DMAE=y
   CONFIG_ASYNC_TX_DMA=y
   CONFIG_STAGING=y
++ CONFIG_SENSORS_AK8975=y
++ CONFIG_IIO=y
   # CONFIG_DNOTIFY is not set
- -CONFIG_INOTIFY_USER=y
   CONFIG_VFAT_FS=y
   CONFIG_TMPFS=y
   # CONFIG_MISC_FILESYSTEMS is not set