From: Olof Johansson <olof@lixom.net>
Date: Tue, 6 Nov 2012 14:15:54 +0000 (-0800)
Subject: Merge branch 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renes... 
X-Git-Tag: upstream/snapshot3+hdmi~6099^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a46052c1941fd5ac1d8a73f1be32283493f21562;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'defconfig' of git://git./linux/kernel/git/horms/renesas into next/boards

From Simon Horman:

"I will work on the suggestions by Arnd to reduce the number
of defconfigs for shmobile - in essence moving towards one or
two generic configs rather than per-board configs. However,
this seems to be somewhat non-trivial and in the mean time
I would like to keep updating the existing defcoings."

* 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: leave CONFIG_INOTIFY_USER enabled by default
  ARM: shmobile: armadillo800eva: enable L2X0 cache on defconfig
  ARM: shmobile: mackerel: defconfig update
---

a46052c1941fd5ac1d8a73f1be32283493f21562
diff --cc arch/arm/configs/kzm9g_defconfig
index ce99e3e,b377a6f..afbae28
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@@ -121,10 -119,7 +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