aboutsummaryrefslogtreecommitdiffstats
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 9378bcde73a4..bf96ae9d93a3 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -420,16 +420,6 @@ extern int sbf_port ;
420 420
421#define acpi_mp_config 0 421#define acpi_mp_config 0
422 422
423static inline int acpi_boot_init(void)
424{
425 return 0;
426}
427
428static inline int acpi_boot_table_init(void)
429{
430 return 0;
431}
432
433#endif /*!CONFIG_ACPI_BOOT*/ 423#endif /*!CONFIG_ACPI_BOOT*/
434 424
435int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); 425int 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)
536 526
537extern int pnpacpi_disabled; 527extern int pnpacpi_disabled;
538 528
529#else /* CONFIG_ACPI */
530
531static inline int acpi_boot_init(void)
532{
533 return 0;
534}
535
536static inline int acpi_boot_table_init(void)
537{
538 return 0;
539}
540
539#endif /* CONFIG_ACPI */ 541#endif /* CONFIG_ACPI */
540#endif /*_LINUX_ACPI_H*/ 542#endif /*_LINUX_ACPI_H*/