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-aarch64.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-aarch64.config')
-rw-r--r-- | kernel-aarch64.config | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 91b1e815d..b5715c027 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1150,7 +1150,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 @@ -4119,6 +4119,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_GSBI=y CONFIG_QCOM_HIDMA=m CONFIG_QCOM_HIDMA_MGMT=m +CONFIG_QCOM_IOMMU=y CONFIG_QCOM_IRQ_COMBINER=y CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y @@ -5029,8 +5030,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 is not set @@ -5231,8 +5232,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 |