[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
This commit is contained in:
Ben Hutchings 2013-08-31 22:02:21 +00:00
parent 253f2f8516
commit 5b305e6619
2 changed files with 2 additions and 1 deletions

1
debian/changelog vendored
View File

@ -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 <ben@decadent.org.uk> Fri, 30 Aug 2013 02:31:22 +0100

View File

@ -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