From 5b305e66197495b9b92a5a18a0f81db314af14fd Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 31 Aug 2013 22:02:21 +0000 Subject: [PATCH] [x86] ACPI: Re-enable ACPI_HOTPLUG_MEMORY as built-in We try to build it as a module, which is no longer supported since 3.10. svn path=/dists/sid/linux/; revision=20539 --- debian/changelog | 1 + debian/config/kernelarch-x86/config | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1f35c0ace..7c40fc819 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,7 @@ linux (3.10.10-1) UNRELEASED; urgency=low - rcu: Use swait_wake_all() in rcu_nocb_gp_cleanup() * aufs: Update to aufs3.10-20130826 * aufs: mvdown, don't let unprivileged users provoke a WARNING + * [x86] ACPI: Re-enable ACPI_HOTPLUG_MEMORY as built-in -- Ben Hutchings Fri, 30 Aug 2013 02:31:22 +0100 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 2e306ad3e..61177c460 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -154,7 +154,7 @@ CONFIG_ACPI_THERMAL=m # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_PCI_SLOT=y CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_HOTPLUG_MEMORY=m +CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=m # CONFIG_ACPI_CUSTOM_METHOD is not set