diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-05-25 11:13:52 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-05-25 11:13:52 -0400 |
| commit | 42d2805cbe603c4665670101f6a676eb0dd07abe (patch) | |
| tree | f90742b1e7e5aea36e869f408e598db0d0bb9928 /config-armv7 | |
| parent | cfaea7dc727cbea3f1150d2f8e9749a167519e32 (diff) | |
| download | kernel-42d2805cbe603c4665670101f6a676eb0dd07abe.tar.gz kernel-42d2805cbe603c4665670101f6a676eb0dd07abe.tar.xz kernel-42d2805cbe603c4665670101f6a676eb0dd07abe.zip | |
Linux v4.6-10203-g84787c572d40
- Enable CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE (rhbz 1339281)
- Fixup SB patchset to work with upstream changes
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 |