summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-10-15 12:58:58 +0100
committerPeter Robinson <pbrobinson@gmail.com>2016-10-15 12:58:58 +0100
commit14a79ed544a368ea8ad9d0e5eff225f8991553c2 (patch)
tree2dc84761d788515419632f0ac2d3b54b63597294 /config-armv7-generic
parentcc77719c1de4aeb841b98fcc07e407884941626f (diff)
downloadkernel-14a79ed544a368ea8ad9d0e5eff225f8991553c2.tar.gz
kernel-14a79ed544a368ea8ad9d0e5eff225f8991553c2.tar.xz
kernel-14a79ed544a368ea8ad9d0e5eff225f8991553c2.zip
Minor ARM config cleanups
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic5
1 files changed, 2 insertions, 3 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index fe2002a99..c9e4c6ce2 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -211,7 +211,7 @@ CONFIG_I2C_SUN6I_P2WI=m
CONFIG_GPIO_PCF857X=m
CONFIG_TOUCHSCREEN_SUN4I=m
CONFIG_MFD_AXP20X=y
-CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_AXP20X_I2C=y
CONFIG_MFD_AXP20X_RSB=m
CONFIG_AXP20X_POWER=m
CONFIG_INPUT_AXP20X_PEK=m
@@ -325,6 +325,7 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
# CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+CONFIG_MFD_EXYNOS_LPASS=m
CONFIG_SND_SOC_SAMSUNG=m
CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
@@ -403,8 +404,6 @@ CONFIG_RTC_DRV_ARMADA38X=m
# CONFIG_CACHE_FEROCEON_L2 is not set
# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
CONFIG_LEDS_NS2=m
-CONFIG_SERIAL_MVEBU_UART=y
-# CONFIG_SERIAL_MVEBU_CONSOLE is not set
# CONFIG_PCIE_ARMADA_8K is not set
# DRM panels