[ACPI] CONFIG_ACPI=n build fix
authorAndrew Morton <akpm@osdl.org>
Sat, 30 Jul 2005 08:18:00 +0000 (04:18 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 5 Aug 2005 02:27:11 +0000 (22:27 -0400)
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
include/linux/acpi.h

index 9378bcde73a4f54c148475cfa12ef5145f681548..bf96ae9d93a3b8d48097abf320b15d2d2dc45f10 100644 (file)
@@ -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*/