summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-09-02 10:18:26 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-09-02 10:18:26 -0400
commitbb4aedb3758bbcb54cb5e9313c62303ab9f50096 (patch)
tree126d37c9432a533c23a5cac6344abdffe1dfec11 /config-armv7
parent861ffc70d2fe2e606ad39543f2d1793a53e6d283 (diff)
downloadkernel-bb4aedb3758bbcb54cb5e9313c62303ab9f50096.tar.gz
kernel-bb4aedb3758bbcb54cb5e9313c62303ab9f50096.tar.xz
kernel-bb4aedb3758bbcb54cb5e9313c62303ab9f50096.zip
Linux v4.2-3986-g73b6fa8e49c2
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv73
1 files changed, 3 insertions, 0 deletions
diff --git a/config-armv7 b/config-armv7
index 2eb589bcc..f9369e44c 100644
--- a/config-armv7
+++ b/config-armv7
@@ -335,6 +335,7 @@ CONFIG_PHY_QCOM_UFS=m
CONFIG_HWSPINLOCK_QCOM=m
CONFIG_QCOM_COINCELL=m
CONFIG_USB_QCOM_8X16_PHY=m
+# CONFIG_QCOM_SMEM is not set
# i.MX
# CONFIG_MXC_DEBUG_BOARD is not set
@@ -344,6 +345,7 @@ CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
CONFIG_SOC_IMX6SX=y
+CONFIG_SOC_IMX6UL=y
CONFIG_SOC_IMX7D=y
# CONFIG_SOC_LS1021A is not set
# CONFIG_SOC_VF610 is not set
@@ -367,6 +369,7 @@ CONFIG_NET_VENDOR_FREESCALE=y
CONFIG_FEC=m
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_XGMAC_MDIO is not set
+CONFIG_KEYBOARD_SNVS_PWRKEY=m
CONFIG_KEYBOARD_IMX=m
CONFIG_KEYBOARD_STMPE=m
CONFIG_TOUCHSCREEN_STMPE=m