diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-21 09:39:20 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-21 09:39:20 +0200 |
commit | 8c016b1a32ec77fb87d22f2d778913cfdba8a6cc (patch) | |
tree | ad8115db90edc70998f74f950c1eeb1493496284 /kernel-armv7hl.config | |
parent | 52f824c54f91fd8e3d4d1649ca0e03401e2a9962 (diff) | |
parent | cd872e7a3e9c22fca7caf782f798d2fd95383410 (diff) | |
download | kernel-8c016b1a32ec77fb87d22f2d778913cfdba8a6cc.tar.gz kernel-8c016b1a32ec77fb87d22f2d778913cfdba8a6cc.tar.xz kernel-8c016b1a32ec77fb87d22f2d778913cfdba8a6cc.zip |
Merge remote-tracking branch 'origin/stabilization' into stabilizationkernel-4.12.3-1.vanilla.knurd.1.fc26kernel-4.12.3-1.vanilla.knurd.1.fc25kernel-4.12.3-1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-armv7hl.config')
-rw-r--r-- | kernel-armv7hl.config | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 79348b2a7..19187df50 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -917,7 +917,6 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set CONFIG_COMMON_CLK_MAX77686=m -CONFIG_COMMON_CLK_MAX77802=m CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y @@ -1213,7 +1212,7 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m CONFIG_DEVFREQ_THERMAL=y # CONFIG_DEVKMEM is not set CONFIG_DEVMEM=y -# CONFIG_DEVPORT is not set +CONFIG_DEVPORT=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS=y # CONFIG_DGAP is not set @@ -4441,6 +4440,7 @@ CONFIG_QCOM_COINCELL=m CONFIG_QCOM_GSBI=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set +CONFIG_QCOM_IOMMU=y CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_QCOM_PM=y CONFIG_QCOM_Q6V5_PIL=m @@ -5423,8 +5423,8 @@ CONFIG_SND_INDIGODJX=m CONFIG_SND_INDIGOIO=m CONFIG_SND_INDIGOIOX=m CONFIG_SND_INDIGO=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set CONFIG_SND_ISIGHT=m CONFIG_SND_JACK=y CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m @@ -5673,8 +5673,8 @@ CONFIG_SND_USB_VARIAX=m CONFIG_SND_USB=y # CONFIG_SND_VERBOSE_PRINTK is not set CONFIG_SND_VERBOSE_PROCFS=y -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set CONFIG_SND_VIRMIDI=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m |