diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-24 07:53:18 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-24 07:53:18 +0200 |
| commit | 3d1f9b96026f06f1d6130a975ad9988c33dc3b0d (patch) | |
| tree | 2a785b0cc414418e76274b39ad21a5a64fc5ae9f /config-s390x | |
| parent | a7a0c90031acf1cd1e7bd777bda70e1738c805c9 (diff) | |
| parent | cfaea7dc727cbea3f1150d2f8e9749a167519e32 (diff) | |
| download | kernel-3d1f9b96026f06f1d6130a975ad9988c33dc3b0d.tar.gz kernel-3d1f9b96026f06f1d6130a975ad9988c33dc3b0d.tar.xz kernel-3d1f9b96026f06f1d6130a975ad9988c33dc3b0d.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc22
Diffstat (limited to 'config-s390x')
| -rw-r--r-- | config-s390x | 1 |
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" |