From: Olof Johansson Date: Wed, 4 Dec 2013 00:52:33 +0000 (-0800) Subject: Merge tag 'renesas-defconfig-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v3.14-rc1~111^2~15 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=38e67641b9f0ec421a51a258d23974a06fb7b884;p=linux.git Merge tag 'renesas-defconfig-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards From Simon Horman: Renesas ARM based SoC defconfig updates for v3.14 * Add Genmai defconfig - The board was added in v3.13 but the defconfig missed the cut * Enable AUTO_ZRELADDR for kzm9d board * Enable HPB-DMAC, PACKET, VFP on bockw and marzen boards * Do not disable INOTIFY_USER on bockw or marzen boards * Do not enable CONFIG_DEVTMPFS on bockw or marzen boards * Do not enable CONFIG_SMC911X on marzen - That hardware does not exist on the marzen board * Do not set command line on bockw or marzen boards - This is handled in the DTS * Enable REGULATOR on bockw board * tag 'renesas-defconfig-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: kzm9d: Enable AUTO_ZRELADDR in defconfig ARM: shmobile: bockw: enable HPB-DMAC in defconfig ARM: shmobile: marzen: enable HPB-DMAC in defconfig ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig ARM: shmobile: bockw: Enable CONFIG_PACKET in defconfig ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig ARM: shmobile: marzen: Enable CONFIG_VFP in defconfig ARM: shmobile: bockw: Enable CONFIG_VFP in defconfig ARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfig ARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfig ARM: shmobile: marzen: Do not set command line in defconfig ARM: shmobile: bockw: Do not set command line in defconfig ARM: shmobile: bockw: enable CONFIG_REGULATOR ARM: shmobile: Genmai defconfig Signed-off-by: Olof Johansson --- 38e67641b9f0ec421a51a258d23974a06fb7b884