summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/utmisc.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2015-04-13 05:49:39 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-14 14:51:52 +0200
commit6306bf886222f382d59bbb8b72bf6996cbba1f6e (patch)
treedfc45f9a5b595bf37564ea0448f07e0629b65148 /drivers/acpi/acpica/utmisc.c
parentACPICA: Tables: Move an iasl specific table function to iasl source file. (diff)
downloadlinux-6306bf886222f382d59bbb8b72bf6996cbba1f6e.tar.xz
linux-6306bf886222f382d59bbb8b72bf6996cbba1f6e.zip
ACPICA: Utilities: Correct conditional compilation definitions.
ACPICA commit 9a5982afbebc56289c4834b5f6dac87e0f04af14 Some conditional compilation definitions are wrong across header and source files. This patch corrects them for the utilities component. Link: https://github.com/acpica/acpica/commit/9a5982af Reported-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/utmisc.c')
-rw-r--r--drivers/acpi/acpica/utmisc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index 56bbacd576f2..cbb7034d28d8 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -75,6 +75,7 @@ u8 acpi_ut_is_pci_root_bridge(char *id)
return (FALSE);
}
+#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP)
/*******************************************************************************
*
* FUNCTION: acpi_ut_is_aml_table
@@ -102,6 +103,7 @@ u8 acpi_ut_is_aml_table(struct acpi_table_header *table)
return (FALSE);
}
+#endif
/*******************************************************************************
*