summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-09-08 08:34:33 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-09-08 08:34:33 -0400
commit31448c54f6beec3379570633eef2436db361b26f (patch)
tree70db236286c758ba8e346e3b770b8fe1d60adfe8 /config-armv7
parentf88858c592075f9b1ac9149d8c150025e944ebcc (diff)
downloadkernel-31448c54f6beec3379570633eef2436db361b26f.tar.gz
kernel-31448c54f6beec3379570633eef2436db361b26f.tar.xz
kernel-31448c54f6beec3379570633eef2436db361b26f.zip
Linux v4.2-9700-g7d9071a09502
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 f9369e44c..2f9e02ba7 100644
--- a/config-armv7
+++ b/config-armv7
@@ -278,6 +278,7 @@ CONFIG_PINCTRL_MSM8960=m
CONFIG_PINCTRL_MSM8X74=m
CONFIG_PINCTRL_MSM8916=m
CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
CONFIG_COMMON_CLK_QCOM=m
# CONFIG_MSM_GCC_8916 is not set
# CONFIG_IPQ_LCC_806X is not set
@@ -610,6 +611,7 @@ CONFIG_CADENCE_WATCHDOG=m
CONFIG_REGULATOR_ISL9305=m
CONFIG_EDAC_SYNOPSYS=m
CONFIG_PINCTRL_ZYNQ=y
+CONFIG_AXI_DMAC=m
# Multi function devices
CONFIG_MFD_88PM800=m