diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 02:28:20 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 14:04:36 (GMT) |
commit | a1ec657213b4abb00e59385171554a3e11eec27c (patch) | |
tree | f0401522eb90acee967c21660a4e3144b8276741 /drivers/acpi/Makefile | |
parent | d34afa9de4447367b734ec407e5a9e10617d6ec3 (diff) | |
download | linux-a1ec657213b4abb00e59385171554a3e11eec27c.tar.xz |
ACPI / scan: always register container scan handler
Prevent platform devices from being created for ACPI containers
if CONFIG_ACPI_CONTAINER is unset by compiling out the container
scan handler's callbacks only in that case and still compiling
its device ID list in and registering the scan handler in either
case.
This change is based on a prototype from Zhang Rui.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/acpi/Makefile')
-rw-r--r-- | drivers/acpi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 144671a..4f23f32 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -64,7 +64,7 @@ obj-$(CONFIG_ACPI_FAN) += fan.o obj-$(CONFIG_ACPI_VIDEO) += video.o obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o obj-$(CONFIG_ACPI_PROCESSOR) += processor.o -obj-$(CONFIG_ACPI_CONTAINER) += container.o +obj-y += container.o obj-$(CONFIG_ACPI_THERMAL) += thermal.o obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o obj-$(CONFIG_ACPI_BATTERY) += battery.o |