aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/acpi.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 9378bcde73a..bf96ae9d93a 100644
--- 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*/