summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-11-21 22:57:20 +0000
committerPeter Robinson <pbrobinson@gmail.com>2013-11-21 22:57:20 +0000
commit464a3b821827ab828737b633ebb9964e1c71e910 (patch)
treec9ef8ad5353caa8ad3e4d084a885adc20e54740d /config-armv7
parent772b620d713a3d73f9a2c053ba65e43fb84615f4 (diff)
downloadkernel-464a3b821827ab828737b633ebb9964e1c71e910.tar.gz
kernel-464a3b821827ab828737b633ebb9964e1c71e910.tar.xz
kernel-464a3b821827ab828737b633ebb9964e1c71e910.zip
Some minor ARM config updates
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv74
1 files changed, 2 insertions, 2 deletions
diff --git a/config-armv7 b/config-armv7
index fe04220fe..2ed93b846 100644
--- a/config-armv7
+++ b/config-armv7
@@ -312,10 +312,9 @@ CONFIG_TI_EMIF=m
CONFIG_DRM_TILCDC=m
CONFIG_SPI_DAVINCI=m
CONFIG_SND_DAVINCI_SOC=m
-CONFIG_REGULATOR_TI_ABB=y
+CONFIG_REGULATOR_TI_ABB=m
CONFIG_TI_CPPI41=m
CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_CHARGER_BQ24190=m
CONFIG_TI_ADC081C=m
CONFIG_TI_AM335X_ADC=m
CONFIG_PWM_TIPWMSS=y
@@ -352,6 +351,7 @@ CONFIG_FEC=m
CONFIG_KEYBOARD_IMX=m
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_PINCTRL_IMX6SL=y
CONFIG_I2C_IMX=m
CONFIG_SPI_IMX=m
CONFIG_MFD_MC13783=m