summaryrefslogtreecommitdiffstats
path: root/config-x86-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-x86-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-x86-generic')
-rw-r--r--config-x86-generic1
1 files changed, 0 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 5418ee7ab..ee027a425 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -361,7 +361,6 @@ CONFIG_DMI_SYSFS=y
CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m
-CONFIG_DMADEVICES=y
CONFIG_INTEL_IOATDMA=m
CONFIG_INTEL_IDMA64=m