From efe78d15cfe967bf8936d21c9f1875b995f36ab5 Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Wed, 22 Apr 2009 10:28:22 +0800 Subject: [PATCH] --- yaml --- r: 150991 b: refs/heads/master c: 8eb7b2477c4e4fec4788605e4edb5f7acafb59ff h: refs/heads/master i: 150989: fa542b3f655114c2fe18b04ea9eba4ca5a53635b 150987: 4483054e30cd9eb5bef16d123c11b39411464f94 150983: 1053a622f8edc6ec7fa203c2b2a6fe45575bd3f8 150975: e80e1a017ad1728fe64f57a8ee5aef1b75cc3f39 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/hwregs.c | 4 ++-- trunk/include/acpi/platform/acgcc.h | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1f4fcb8129be..cdf5152ca1dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b74be6119e9e38390395f08767b7c84de9023b38 +refs/heads/master: 8eb7b2477c4e4fec4788605e4edb5f7acafb59ff diff --git a/trunk/drivers/acpi/acpica/hwregs.c b/trunk/drivers/acpi/acpica/hwregs.c index 7b2fb602b5cb..23d5505cb1f7 100644 --- a/trunk/drivers/acpi/acpica/hwregs.c +++ b/trunk/drivers/acpi/acpica/hwregs.c @@ -81,9 +81,9 @@ acpi_status acpi_hw_clear_acpi_status(void) ACPI_FUNCTION_TRACE(hw_clear_acpi_status); - ACPI_DEBUG_PRINT((ACPI_DB_IO, "About to write %04X to %0llX\n", + ACPI_DEBUG_PRINT((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n", ACPI_BITMASK_ALL_FIXED_STATUS, - acpi_gbl_xpm1a_status.address)); + ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address))); lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock); diff --git a/trunk/include/acpi/platform/acgcc.h b/trunk/include/acpi/platform/acgcc.h index 8e2cdc57b197..935c5d7fc86e 100644 --- a/trunk/include/acpi/platform/acgcc.h +++ b/trunk/include/acpi/platform/acgcc.h @@ -62,4 +62,8 @@ */ #define ACPI_UNUSED_VAR __attribute__ ((unused)) +#ifdef _ANSI +#define inline +#endif + #endif /* __ACGCC_H__ */