From: Rafael J. Wysocki Date: Fri, 30 May 2014 12:34:05 +0000 (+0200) Subject: ACPI / scan: always register ACPI LPSS scan handler X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~5^2~7^2~1 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6ddaaac8f5c37ad84db3e6e019981f392389cf0;p=pandora-kernel.git ACPI / scan: always register ACPI LPSS scan handler Prevent platform devices from being created for ACPI LPSS devices if CONFIG_X86_INTEL_LPSS is unset by compiling out the LPSS 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 Reviewed-by: Mika Westerberg --- diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index f1c9266430d9..ea55e0179f81 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -39,7 +39,7 @@ acpi-y += processor_core.o acpi-y += ec.o acpi-$(CONFIG_ACPI_DOCK) += dock.o acpi-y += pci_root.o pci_link.o pci_irq.o -acpi-$(CONFIG_X86_INTEL_LPSS) += acpi_lpss.o +acpi-y += acpi_lpss.o acpi-y += acpi_platform.o acpi-y += acpi_pnp.o acpi-y += power.o Reading git-diff-tree failed