diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-29 22:24:02 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-29 22:24:02 +0100 |
| commit | 8708138951b08441f4e18e75a2d012750261f0c0 (patch) | |
| tree | 5b81faae058586a234477dfac563b023960d5342 /arch/arm/configs/genmai_defconfig | |
| parent | Merge tag 'renesas-boards-for-v3.14' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | ARM: shmobile: koelsch: Do not disable CONFIG_{INOTIFY_USER,UNIX} in defconfig (diff) | |
| download | linux-8708138951b08441f4e18e75a2d012750261f0c0.tar.xz linux-8708138951b08441f4e18e75a2d012750261f0c0.zip | |
Merge tag 'renesas-defconfig2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman:
Second Round of Renesas ARM Based SoC Defconfig Updates for v3.14
* r7s72100 SoC (RZ/A1H) based Genmai Board
- Fixup I2C device on defconfig
- Add gpio regulator support on defconfig
* r8a7791 (R-Car M2) based Koelsch board
- Do not disable CONFIG_{INOTIFY_USER,UNIX} in defconfig
- Enable CONFIG_PACKET in defconfig
- Enable Ether in defconfig
* r8a7740 (R-Mobile A1) based Armadillo board
- Enable backlight control in defconfig
* r8a7740 (R-Mobile A1) based Armadillo board
- Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
* tag 'renesas-defconfig2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: koelsch: Do not disable CONFIG_{INOTIFY_USER,UNIX} in defconfig
ARM: shmobile: koelsch: Enable CONFIG_PACKET in defconfig
ARM: shmobile: armadillo800eva: Enable backlight control in defconfig
ARM: shmobile: Koelsch: enable Ether in defconfig
ARM: shmobile: genmai: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
ARM: shmobile: lager: fixup I2C device on defconfig
ARM: shmobile: lager: add gpio regulator support on defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/genmai_defconfig')
| -rw-r--r-- | arch/arm/configs/genmai_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig index 69b1531a4c80..aa0b704f48af 100644 --- a/arch/arm/configs/genmai_defconfig +++ b/arch/arm/configs/genmai_defconfig @@ -12,7 +12,7 @@ CONFIG_SLAB=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y +CONFIG_ARCH_SHMOBILE_LEGACY=y CONFIG_ARCH_R7S72100=y CONFIG_MACH_GENMAI=y # CONFIG_SH_TIMER_CMT is not set |