diff options
| author | Andrew Morton | 2005-07-30 10:18:00 +0200 |
|---|---|---|
| committer | Len Brown | 2005-08-05 04:27:11 +0200 |
| commit | 53de49f52e305e96143375d1741f15acff7bf34b (patch) | |
| tree | 6cde6659eef13063c6408df2e81dd3a8af60e787 /include/linux/acpi.h | |
| parent | [ACPI] iosapic_register_intr() now returns error instead of panic (diff) | |
| download | kernel-qcow2-linux-53de49f52e305e96143375d1741f15acff7bf34b.tar.gz kernel-qcow2-linux-53de49f52e305e96143375d1741f15acff7bf34b.tar.xz kernel-qcow2-linux-53de49f52e305e96143375d1741f15acff7bf34b.zip | |
[ACPI] CONFIG_ACPI=n build fix
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 22 |
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 ; #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*/ |