aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Stone <ahs3@redhat.com>2013-11-09 17:08:01 -0700
committerGraeme Gregory <graeme.gregory@linaro.org>2013-11-19 10:30:37 +0000
commitd54d12560112064e0c2beaea1c2700685915388d (patch)
tree4f56ef0b1c07eb42122fed4ca7ff83cb0726643e
parent3d112498612b0e6247fe5068bee395e819498921 (diff)
downloadleg-kernel-d54d12560112064e0c2beaea1c2700685915388d.tar.gz
ACPI: correct #ifdef so compilation without ACPI_REDUCED_HARDWARE works
Signed-off-by: Al Stone <al.stone@linaro.org> Acked-by: Graeme Gregory <graeme.gregory@linaro.org>
-rw-r--r--drivers/acpi/bus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 5e55b533917a..9215cc650b7b 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -512,7 +512,7 @@ void __init acpi_early_init(void)
acpi_gbl_permanent_mmap = 1;
-#if (CONFIG_ARM || CONFIG_ARM64)
+#if !(defined(CONFIG_ARM) || defined(CONFIG_ARM64))
/*
* NB: ARM does not use DMI at present.
*
@@ -543,7 +543,7 @@ void __init acpi_early_init(void)
goto error0;
}
-#if (!CONFIG_ACPI_REDUCED_HARDWARE)
+#if !(defined(CONFIG_ARM) || defined(CONFIG_ARM64)) && (!ACPI_REDUCED_HARDWARE)
/* NB: in HW reduced mode, FADT sci_interrupt has no meaning */
if (!acpi_ioapic) {
/* compatible (0) means level (3) */