From: Rafael J. Wysocki Date: Mon, 8 Dec 2014 18:52:16 +0000 (+0100) Subject: Merge branches 'acpi-scan', 'acpi-pm', 'acpi-lpss' and 'acpi-processor' X-Git-Tag: firefly_0821_release~176^2~2728^2~6 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=69bad361e69ac0e9f96865f405439e7cbd8c0136;p=firefly-linux-kernel-4.4.55.git Merge branches 'acpi-scan', 'acpi-pm', 'acpi-lpss' and 'acpi-processor' * acpi-scan: ACPI: Add _DEP support to fix battery issue on Asus T100TA * acpi-pm: ACPI / sleep: Drain outstanding events after disabling multiple GPEs ACPI / PM: Fixed a typo in a comment * acpi-lpss: dmaengine: dw: enable runtime PM ACPI / LPSS: introduce a 'proxy' device to power on LPSS for DMA ACPI / LPSS: allow to use specific PM domain during ->probe() ACPI / LPSS: add all LPSS devices to the specific power domain * acpi-processor: ACPI / cpuidle: avoid assigning signed errno to acpi_status ACPI / processor: remove unused variabled from acpi_processor_power structure ACPI / processor: Update the comments in processor.h --- 69bad361e69ac0e9f96865f405439e7cbd8c0136 diff --cc include/linux/acpi.h index 0ccaa093010c,6cb310388c88,407a12f663eb,407a12f663eb,407a12f663eb..d7a5fcf9ef0f --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@@@@@ -428,10 -423,15 -423,14 -423,14 -423,14 +428,11 @@@@@@ extern int acpi_nvs_for_each_region(in const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, const struct device *dev); ----static inline bool acpi_driver_match_device(struct device *dev, ---- const struct device_driver *drv) ----{ ---- return !!acpi_match_device(drv->acpi_match_table, dev); ----} ---- ++++extern bool acpi_driver_match_device(struct device *dev, ++++ const struct device_driver *drv); int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *); int acpi_device_modalias(struct device *, char *, int); + +++void acpi_walk_dep_device_list(acpi_handle handle); struct platform_device *acpi_create_platform_device(struct acpi_device *); #define ACPI_PTR(_ptr) (_ptr)