From e31bb588b48eba4590969fa01a1cb345f01d38cb Mon Sep 17 00:00:00 2001
From: Lin Ming <ming.m.lin@intel.com>
Date: Wed, 15 Sep 2010 13:36:55 +0800
Subject: [PATCH] --- yaml --- r: 217639 b: refs/heads/master c:
 8f40f171a29d0d2ae1ca8bd4a0c3fc9f514d1e20 h: refs/heads/master i:   217637:
 c2d53cfec4809b8f4eaf822d68acb8004bb464ab   217635:
 11d30db26abf6cf7b8811a3c670d5947fdd6dcbe   217631:
 d167afb36a89d510afc6a8c258f9b63c340537fa v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/acpica/tbfadt.c  | 4 ++--
 trunk/include/acpi/platform/acenv.h | 6 ++++++
 trunk/include/acpi/platform/acgcc.h | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 687d9c7d4632..659fc842acaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95abccb576c44bc593e05fa1245d0ad26ce6107b
+refs/heads/master: 8f40f171a29d0d2ae1ca8bd4a0c3fc9f514d1e20
diff --git a/trunk/drivers/acpi/acpica/tbfadt.c b/trunk/drivers/acpi/acpica/tbfadt.c
index 1728cb9bf600..d2ff4325c427 100644
--- a/trunk/drivers/acpi/acpica/tbfadt.c
+++ b/trunk/drivers/acpi/acpica/tbfadt.c
@@ -49,7 +49,7 @@
 ACPI_MODULE_NAME("tbfadt")
 
 /* Local prototypes */
-static inline void
+static ACPI_INLINE void
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
 			     u8 space_id, u8 byte_width, u64 address);
 
@@ -181,7 +181,7 @@ static struct acpi_fadt_pm_info fadt_pm_info_table[] = {
  *
  ******************************************************************************/
 
-static inline void
+static ACPI_INLINE void
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
 			     u8 space_id, u8 byte_width, u64 address)
 {
diff --git a/trunk/include/acpi/platform/acenv.h b/trunk/include/acpi/platform/acenv.h
index c05aeba9e8f0..a3e334ab1119 100644
--- a/trunk/include/acpi/platform/acenv.h
+++ b/trunk/include/acpi/platform/acenv.h
@@ -193,6 +193,12 @@
 #define ACPI_MUTEX_TYPE             ACPI_BINARY_SEMAPHORE
 #endif
 
+/* "inline" keywords - configurable since inline is not standardized */
+
+#ifndef ACPI_INLINE
+#define ACPI_INLINE
+#endif
+
 /*
  * Debugger threading model
  * Use single threaded if the entire subsystem is contained in an application
diff --git a/trunk/include/acpi/platform/acgcc.h b/trunk/include/acpi/platform/acgcc.h
index 0cd53e3cd1a3..5dcb9537343c 100644
--- a/trunk/include/acpi/platform/acgcc.h
+++ b/trunk/include/acpi/platform/acgcc.h
@@ -44,6 +44,8 @@
 #ifndef __ACGCC_H__
 #define __ACGCC_H__
 
+#define ACPI_INLINE             __inline__
+
 /* Function name is used for debug output. Non-ANSI, compiler-dependent */
 
 #define ACPI_GET_FUNCTION_NAME          __func__