diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-06 17:33:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-06 17:33:56 -0700 |
| commit | 4c015ba24bbe8558cce5925546abd590e4146a23 (patch) | |
| tree | 8bff5827d8667c7d2d87b0daec763e41a8a7b0b0 /mm/Kconfig | |
| parent | d1ddb0a6bb665dce10314bb5b9960e197e814820 (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
| download | op-kernel-dev-4c015ba24bbe8558cce5925546abd590e4146a23.zip op-kernel-dev-4c015ba24bbe8558cce5925546abd590e4146a23.tar.gz | |
Merge 3.12-rc4 into usb-next
We want the USB fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/Kconfig')
| -rw-r--r-- | mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -183,7 +183,7 @@ config MEMORY_HOTPLUG_SPARSE config MEMORY_HOTREMOVE bool "Allow for memory hot remove" select MEMORY_ISOLATION - select HAVE_BOOTMEM_INFO_NODE if X86_64 + select HAVE_BOOTMEM_INFO_NODE if (X86_64 || PPC64) depends on MEMORY_HOTPLUG && ARCH_ENABLE_MEMORY_HOTREMOVE depends on MIGRATION |
