summaryrefslogtreecommitdiffstats
path: root/config-s390x
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-05-23 11:41:00 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-05-23 11:41:00 -0700
commitcfaea7dc727cbea3f1150d2f8e9749a167519e32 (patch)
treefdb18ecd726e4826d306ac6c424901690f425935 /config-s390x
parent8a052bf240d0b95d9c255ca9291a0669e5e28ac5 (diff)
downloadkernel-cfaea7dc727cbea3f1150d2f8e9749a167519e32.tar.gz
kernel-cfaea7dc727cbea3f1150d2f8e9749a167519e32.tar.xz
kernel-cfaea7dc727cbea3f1150d2f8e9749a167519e32.zip
Linux v4.6-8907-g7639dad
- trace, f2fs, btrfs, rtc, mailbox, akpm, staging, driver core, char, usb, tty, clk, net, devicetree, rdma, mfd, iio, powerpc, arm merges
Diffstat (limited to 'config-s390x')
-rw-r--r--config-s390x1
1 files changed, 1 insertions, 0 deletions
diff --git a/config-s390x b/config-s390x
index d1ed636d9..e6e2f85a9 100644
--- a/config-s390x
+++ b/config-s390x
@@ -183,6 +183,7 @@ CONFIG_VIRTIO_CONSOLE=y
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTREMOVE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_CHSC_SCH=m
# drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now"