[ACPI] CONFIG_ACPI=n build fix

Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
git-mirror · Aug 5, 2005 · 53de49f · 53de49f
1 parent 14454a1
commit 53de49f
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
@@ -420,16 +420,6 @@ 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*/
 
 int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
@@ -536,5 +526,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*/