diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-12-05 07:26:42 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-12-05 07:26:42 +0100 |
| commit | b01869894b09ef451f7af86c0e24d81265879c80 (patch) | |
| tree | 087041d2da55faddd55f6f8e915d8aad02a5c5f6 /kernel-aarch64.config | |
| parent | 043e648f56fd67cee45abc9e032151e4ff63fc47 (diff) | |
| parent | afeb9a1070413d335cc42588d867f36515b9e25e (diff) | |
| download | kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc27.tar.gz kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc27.tar.xz kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc27.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc26kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-aarch64.config')
| -rw-r--r-- | kernel-aarch64.config | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 8759ce2de..80aa2053f 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1344,6 +1344,8 @@ CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set # CONFIG_DRM_SIS is not set # CONFIG_DRM_STM is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y +CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN8I_MIXER=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_TEGRA_DEBUG is not set @@ -5078,7 +5080,7 @@ CONFIG_SH_ETH=m # CONFIG_SIGMA is not set CONFIG_SIGMATEL_FIR=m CONFIG_SIGNED_PE_FILE_VERIFICATION=y -# CONFIG_SIMPLE_PM_BUS is not set +CONFIG_SIMPLE_PM_BUS=y CONFIG_SIS190=m CONFIG_SIS900=m # CONFIG_SKFP is not set |