aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/armadillo800eva_defconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-12-29 16:24:02 -0500
committerOlof Johansson <olof@lixom.net>2013-12-29 16:24:02 -0500
commit8708138951b08441f4e18e75a2d012750261f0c0 (patch)
tree5b81faae058586a234477dfac563b023960d5342 /arch/arm/configs/armadillo800eva_defconfig
parentacdcbd63314f235fc3f4e580bf2db49161b35d06 (diff)
parent559cec66f1a2620bc85bb79191512a569a404cb8 (diff)
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/armadillo800eva_defconfig')
-rw-r--r--arch/arm/configs/armadillo800eva_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index 5abf1a2e3160..9287a62de830 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -105,6 +105,7 @@ CONFIG_FB=y
105CONFIG_FB_SH_MOBILE_LCDC=y 105CONFIG_FB_SH_MOBILE_LCDC=y
106CONFIG_FB_SH_MOBILE_HDMI=y 106CONFIG_FB_SH_MOBILE_HDMI=y
107CONFIG_LCD_CLASS_DEVICE=y 107CONFIG_LCD_CLASS_DEVICE=y
108CONFIG_BACKLIGHT_PWM=y
108CONFIG_FRAMEBUFFER_CONSOLE=y 109CONFIG_FRAMEBUFFER_CONSOLE=y
109CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 110CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
110CONFIG_LOGO=y 111CONFIG_LOGO=y
@@ -130,6 +131,8 @@ CONFIG_DMADEVICES=y
130CONFIG_SH_DMAE=y 131CONFIG_SH_DMAE=y
131CONFIG_UIO=y 132CONFIG_UIO=y
132CONFIG_UIO_PDRV_GENIRQ=y 133CONFIG_UIO_PDRV_GENIRQ=y
134CONFIG_PWM=y
135CONFIG_PWM_RENESAS_TPU=y
133# CONFIG_DNOTIFY is not set 136# CONFIG_DNOTIFY is not set
134CONFIG_MSDOS_FS=y 137CONFIG_MSDOS_FS=y
135CONFIG_VFAT_FS=y 138CONFIG_VFAT_FS=y