Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08f502c1 authored by Toshi Kani's avatar Toshi Kani Committed by Rafael J. Wysocki
Browse files

ACPI: Do not use CONFIG_ACPI_HOTPLUG_MEMORY_MODULE 



CONFIG_ACPI_HOTPLUG_MEMORY has been changed to bool (y/n), and
its module option is no longer valid.  So, stop using
CONFIG_ACPI_HOTPLUG_MEMORY_MODULE.

Signed-off-by: default avatarToshi Kani <toshi.kani@hp.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c655affb

include/linux/acpi.h

+1 −2
Original line number Diff line number Diff line
@@ -352,8 +352,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, 


/* Enable _OST when all relevant hotplug operations are enabled */

#if defined(CONFIG_ACPI_HOTPLUG_CPU) &&			\

	(defined(CONFIG_ACPI_HOTPLUG_MEMORY) ||		\

	 defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) &&	\

	defined(CONFIG_ACPI_HOTPLUG_MEMORY) &&		\

	defined(CONFIG_ACPI_CONTAINER)

#define ACPI_HOTPLUG_OST

#endif