diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-11-01 19:45:31 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-11-01 19:45:31 +0100 |
| commit | 51965522f24fdf114a56aa5dbaca40733947652a (patch) | |
| tree | 950b394a1b4f462a1d9d1b60ab688064f48e6cf5 /kernel-armv7hl.config | |
| parent | a59d2a403d404c335e5eae4cadcb7f35bdedf492 (diff) | |
| parent | 755a40d40db75b1018a8108b1a968ac1504c4682 (diff) | |
| download | kernel-4.20.0-0.rc0.git8.1.vanilla.knurd.1.fc28.tar.gz kernel-4.20.0-0.rc0.git8.1.vanilla.knurd.1.fc28.tar.xz kernel-4.20.0-0.rc0.git8.1.vanilla.knurd.1.fc28.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.20.0-0.rc0.git8.1.vanilla.knurd.1.fc29kernel-4.20.0-0.rc0.git8.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 50e558ab5..3e66ad351 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3064,6 +3064,8 @@ CONFIG_KGDB=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y +CONFIG_KPSS_XCC=m +CONFIG_KRAITCC=m CONFIG_KS0108_DELAY=2 CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 @@ -4932,6 +4934,7 @@ CONFIG_QCOM_COINCELL=m # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GLINK_SSR is not set CONFIG_QCOM_GSBI=m +CONFIG_QCOM_HFPLL=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set CONFIG_QCOM_IOMMU=y @@ -4961,6 +4964,7 @@ CONFIG_QCOM_TSENS=m CONFIG_QCOM_WCNSS_CTRL=m CONFIG_QCOM_WCNSS_PIL=m CONFIG_QCOM_WDT=m +CONFIG_QCS_GCC_404=m CONFIG_QEDE=m CONFIG_QEDF=m CONFIG_QEDI=m @@ -5552,8 +5556,10 @@ CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y CONFIG_SD_ADC_MODULATOR=m CONFIG_SDIO_UART=m +CONFIG_SDM_CAMCC_845=m # CONFIG_SDM_DISPCC_845 is not set -# CONFIG_SDM_GCC_845 is not set +CONFIG_SDM_GCC_660=m +CONFIG_SDM_GCC_845=m # CONFIG_SDM_VIDEOCC_845 is not set CONFIG_SECCOMP=y CONFIG_SECONDARY_TRUSTED_KEYRING=y @@ -7468,6 +7474,8 @@ CONFIG_VIDEO_STI_HVA=m CONFIG_VIDEO_STK1160_AC97=y CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m +# CONFIG_VIDEO_SUNXI_CEDRUS is not set +CONFIG_VIDEO_SUNXI=y CONFIG_VIDEO_TEGRA_HDMI_CEC=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m |