summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-05-25 11:13:52 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-05-25 11:13:52 -0400
commit42d2805cbe603c4665670101f6a676eb0dd07abe (patch)
treef90742b1e7e5aea36e869f408e598db0d0bb9928 /config-generic
parentcfaea7dc727cbea3f1150d2f8e9749a167519e32 (diff)
downloadkernel-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-generic')
-rw-r--r--config-generic4
1 files changed, 4 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index b94ee30f7..c08fb2e99 100644
--- a/config-generic
+++ b/config-generic
@@ -598,6 +598,7 @@ CONFIG_ATA_BMDMA=y
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_SFF=y
CONFIG_ATA_PIIX=y
+# CONFIG_SATA_DWC is not set
# CONFIG_SATA_HIGHBANK is not set
CONFIG_ATA_ACPI=y
CONFIG_BLK_DEV_SX8=m
@@ -3346,6 +3347,8 @@ CONFIG_VGA_ARB_MAX_GPUS=16
CONFIG_DRM=m
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+# CONFIG_DRM_ARCPGU is not set
CONFIG_DRM_DP_AUX_CHARDEV=y
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
@@ -3359,6 +3362,7 @@ CONFIG_DRM_AMDGPU=m
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMDGPU_CIK is not set
CONFIG_DRM_AMDGPU_USERPTR=y
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
CONFIG_DRM_AMD_POWERPLAY=y
# CONFIG_DRM_I810 is not set
# CONFIG_DRM_MGA is not set