diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-26 07:58:40 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-26 07:58:40 +0200 |
| commit | 348012821f7014b45577b6c34b7f895cd345c63a (patch) | |
| tree | 3ae03f632d74cc113c0752725e8ae75ac25dd9a9 /config-armv7 | |
| parent | 3d1f9b96026f06f1d6130a975ad9988c33dc3b0d (diff) | |
| parent | b43cd9971349391d46e3c71da0b041c7099d6c9a (diff) | |
| download | kernel-348012821f7014b45577b6c34b7f895cd345c63a.tar.gz kernel-348012821f7014b45577b6c34b7f895cd345c63a.tar.xz kernel-348012821f7014b45577b6c34b7f895cd345c63a.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc22
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-armv7 b/config-armv7 index d2191cee9..c3d64fafb 100644 --- a/config-armv7 +++ b/config-armv7 @@ -318,6 +318,8 @@ CONFIG_PHY_QCOM_IPQ806X_SATA=m CONFIG_DWMAC_IPQ806X=m CONFIG_CRYPTO_DEV_QCE=m CONFIG_DRM_MSM=m +# CONFIG_DRM_MSM_REGISTER_LOGGING is not set +CONFIG_DRM_MSM_HDMI_HDCP=y CONFIG_USB_EHCI_MSM=m CONFIG_MFD_PM8XXX=m CONFIG_KEYBOARD_PMIC8XXX=m @@ -325,7 +327,6 @@ CONFIG_INPUT_PM8XXX_VIBRATOR=m CONFIG_INPUT_PMIC8XXX_PWRKEY=m CONFIG_INPUT_PM8941_PWRKEY=m CONFIG_RTC_DRV_PM8XXX=m -# CONFIG_DRM_MSM_REGISTER_LOGGING is not set CONFIG_QCOM_WDT=m CONFIG_MFD_SPMI_PMIC=m CONFIG_SPMI=m |