summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2014-04-11 08:39:57 -0400
committerJosh Boyer <jwboyer@redhat.com>2014-04-11 08:39:57 -0400
commit84c4ae58726420912239f781bf5e6303b634a142 (patch)
tree47b21ea7d4dc1c721882a543ef4f1fb6b92c4d72 /config-armv7
parent2ed67326d8900c168f4c199e2a4d4191563259f0 (diff)
downloadkernel-84c4ae58726420912239f781bf5e6303b634a142.tar.gz
kernel-84c4ae58726420912239f781bf5e6303b634a142.tar.xz
kernel-84c4ae58726420912239f781bf5e6303b634a142.zip
Linux v3.14-12376-g4ba85265790b
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv72
1 files changed, 2 insertions, 0 deletions
diff --git a/config-armv7 b/config-armv7
index d085f236f..ba0b2b6ee 100644
--- a/config-armv7
+++ b/config-armv7
@@ -154,6 +154,7 @@ CONFIG_EXTCON_PALMAS=m
CONFIG_GPIO_PALMAS=y
CONFIG_PINCTRL_PALMAS=y
CONFIG_REGULATOR_PALMAS=y
+CONFIG_REGULATOR_PBIAS=m
CONFIG_RTC_DRV_PALMAS=m
CONFIG_WL_TI=y
@@ -607,6 +608,7 @@ CONFIG_GPIO_XILINX=y
CONFIG_I2C_XILINX=m
CONFIG_SPI_XILINX=m
CONFIG_MMC_SDHCI_OF_ARASAN=m
+CONFIG_I2C_CADENCE=m
# Multi function devices
CONFIG_MFD_88PM800=m