From ee86695c3440475bc587e27a8098c917737306a3 Mon Sep 17 00:00:00 2001 From: "Luck, Tony" Date: Fri, 5 Oct 2012 15:05:34 -0700 Subject: [PATCH] --- yaml --- r: 344053 b: refs/heads/master c: 385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a h: refs/heads/master i: 344051: f8d9b2771416216245c6473ad095ce12a6a577f8 v: v3 --- [refs] | 2 +- trunk/include/linux/acpi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7fac3d5952b2..01c3e8433d3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3dfd8235002727dbd759bb0f80f8ac862f392071 +refs/heads/master: 385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h index d14081c10c17..49fe586e3b1e 100644 --- a/trunk/include/linux/acpi.h +++ b/trunk/include/linux/acpi.h @@ -434,7 +434,7 @@ void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control); -#if CONFIG_X86 +#ifdef CONFIG_X86 void arch_reserve_mem_area(acpi_physical_address addr, size_t size); #else static inline void arch_reserve_mem_area(acpi_physical_address addr,