[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 13 insertions, 11 deletions

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index b46a5205ee7b..fd48db320f5b 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -433,19 +433,9 @@ extern int sbf_port ;
 
 #define acpi_mp_config  0
 
-static inline int acpi_boot_init(void)
-{
-        return 0;
-}
-
-static inline int acpi_boot_table_init(void)
-{
-        return 0;
-}
-
 #endif  /*!CONFIG_ACPI_BOOT*/
 
-unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
+int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
 int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
 
 /*
@@ -549,5 +539,17 @@ static inline int acpi_get_pxm(acpi_handle handle)
 
 extern int pnpacpi_disabled;
 
+#else   /* CONFIG_ACPI */
+
+static inline int acpi_boot_init(void)
+{
+        return 0;
+}
+
+static inline int acpi_boot_table_init(void)
+{
+        return 0;
+}
+
 #endif  /* CONFIG_ACPI */
 #endif  /*_LINUX_ACPI_H*/