diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-10 22:12:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-10 22:12:07 -0700 |
| commit | b52e79152f35379a6bb5b800dcf796209fdebd02 (patch) | |
| tree | f25accd9a0fcae244df0f95fbb3643c7a01a2f89 /arch/arm/mach-shmobile/board-marzen.c | |
| parent | 75ae47f9de39cdea1efc7b5908d5a9ee580ee892 (diff) | |
| parent | 76d415dfa7d53a2f92550484d766ae475a427daf (diff) | |
Merge tag 'renesas-defconfig-for-v3.11' 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.11
kzm9g: Enable AS3711 PMIC
bockw: Enable, USB, PM_RUNTIME, I2C and SDHI
armadillo800eva: Correct SERIAL_SH_SCI_NR_UARTS
* tag 'renesas-defconfig-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: kzm9g: enable AS3711 PMIC in defconfig
ARM: shmobile: bockw: enable USB in defconfig
ARM: shmobile: bockw: enable CONFIG_PM_RUNTIME in defconfig
ARM: shmobile: bockw: enable I2C in defconfig
ARM: shmobile: bockw: enable SDHI on defconfig
ARM: shmobile: armadillo800eva: Fix maximum number of SCIF
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/board-marzen.c')
0 files changed, 0 insertions, 0 deletions