diff options
author | Lv Zheng <lv.zheng@intel.com> | 2015-06-19 11:38:16 +0800 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-23 15:44:53 +0200 |
commit | 52c1d8038594ffd82a6cf88d3dc0ca68d8179a36 (patch) | |
tree | 1ae0e4db3793b5a0261029279781fdd960b5cd1d /drivers/acpi/acpica/hwxfsleep.c | |
parent | f3b6ced236259a87829b829e8e542ff53bfb9a4f (diff) | |
download | linux-52c1d8038594ffd82a6cf88d3dc0ca68d8179a36.tar.gz linux-52c1d8038594ffd82a6cf88d3dc0ca68d8179a36.tar.xz |
ACPICA: Linuxize: Reduce divergences for 20150616 release
This patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20150616 release can be
applied with reduced human intervention.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/hwxfsleep.c')
-rw-r--r-- | drivers/acpi/acpica/hwxfsleep.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c index 3b3767698827..82e310b94ae4 100644 --- a/drivers/acpi/acpica/hwxfsleep.c +++ b/drivers/acpi/acpica/hwxfsleep.c @@ -138,7 +138,6 @@ acpi_status acpi_set_firmware_waking_vector64(u64 physical_address) { ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector64); - /* Determine if the 64-bit vector actually exists */ if ((acpi_gbl_FACS->length <= 32) || (acpi_gbl_FACS->version < 1)) { @@ -154,7 +153,6 @@ acpi_status acpi_set_firmware_waking_vector64(u64 physical_address) ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64) #endif - /******************************************************************************* * * FUNCTION: acpi_enter_sleep_state_s4bios |