summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-29 11:24:25 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-29 11:24:25 -0400
commit76c11d9b55366c6da11ee821716d56b68110a2c6 (patch)
treeb7eae841919f78db12d303d20863564b05bf3f33 /config-armv7
parentc9229e16082bdc9b2f74a08bfdc77bcfed51df18 (diff)
downloadkernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.gz
kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.xz
kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.zip
Linux v4.1-11235-gc63f887bdae8
- Reenable debugging options.
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 9934ac8cc..5be807456 100644
--- a/config-armv7
+++ b/config-armv7
@@ -247,6 +247,7 @@ CONFIG_TI_CPTS=y
CONFIG_REGULATOR_TPS65217=y
CONFIG_TI_EMIF=m
CONFIG_DRM_TILCDC=m
+# CONFIG_DRM_TILCDC_SLAVE_COMPAT is not set
CONFIG_SPI_DAVINCI=m
CONFIG_SND_DAVINCI_SOC=m
CONFIG_SND_DAVINCI_SOC_I2S=m
@@ -303,6 +304,7 @@ CONFIG_MMC_SDHCI_MSM=m
CONFIG_MMC_QCOM_DML=m
CONFIG_QCOM_BAM_DMA=m
CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_PM=y
CONFIG_PHY_QCOM_APQ8064_SATA=m
CONFIG_PHY_QCOM_IPQ806X_SATA=m
CONFIG_USB_DWC3_QCOM=m
@@ -339,6 +341,7 @@ CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
CONFIG_SOC_IMX6SX=y
+CONFIG_SOC_IMX7D=y
# CONFIG_SOC_LS1021A is not set
# CONFIG_SOC_VF610 is not set
CONFIG_ARM_IMX6Q_CPUFREQ=m