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-s390x | |
parent | 3d1f9b96026f06f1d6130a975ad9988c33dc3b0d (diff) | |
parent | b43cd9971349391d46e3c71da0b041c7099d6c9a (diff) | |
download | kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc25.tar.gz kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc25.tar.xz kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc25.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-s390x')
-rw-r--r-- | config-s390x | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-s390x b/config-s390x index e6e2f85a9..d559c6570 100644 --- a/config-s390x +++ b/config-s390x @@ -183,7 +183,7 @@ CONFIG_VIRTIO_CONSOLE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y -# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set +CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y CONFIG_CHSC_SCH=m # drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now" |