diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-12 08:23:22 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-12 08:23:22 +0200 |
| commit | 7bddfcc2716bbdfe5ec367221a0adfe1274fec0b (patch) | |
| tree | 296d5c09ad28e3c802d95e3b33c7e0818292ddf8 /kernel-ppc64le.config | |
| parent | 12566869d34f107fe1903ac60dac8d938d892068 (diff) | |
| parent | 3a2f515354b28762922c8ec3e60235a1ff9f37c4 (diff) | |
| download | kernel-4.13.0-0.rc4.git4.1.vanilla.knurd.1.fc26.tar.gz kernel-4.13.0-0.rc4.git4.1.vanilla.knurd.1.fc26.tar.xz kernel-4.13.0-0.rc4.git4.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc4.git4.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc4.git4.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc4.git4.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-ppc64le.config')
| -rw-r--r-- | kernel-ppc64le.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 37b50330e..de68e7c9d 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2610,7 +2610,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG=y CONFIG_MEMORY_FAILURE=y -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set @@ -4871,7 +4871,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y |