On 11/17/2013 03:28 PM, Rafael J. Wysocki wrote:
On Saturday, November 09, 2013 06:36:22 PM al.stone@linaro.org wrote:
From: Al Stone ahs3@redhat.com
Doesn't this fix problems with one of the previous patches in the series?
Whups. Yes, it does. I'll merge them.
Signed-off-by: Al Stone al.stone@linaro.org
drivers/acpi/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index f41949a..e868de3 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -513,7 +513,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. * @@ -544,7 +544,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) */