diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-05 08:31:42 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-05 08:31:42 +0400 |
| commit | 1d492eb41371d9a5145651e8eb64bea1042a4057 (patch) | |
| tree | 2a66a8fd347cf8dd8a665c4575b30d873035a5a4 /include/linux/acpi.h | |
| parent | 5d2a22079c825669d91a3a200332f1053b4b61b0 (diff) | |
| parent | cbfc1bae55bbd053308ef0fa6b6448cd1ddf3e67 (diff) | |
| download | linux-1d492eb41371d9a5145651e8eb64bea1042a4057.tar.xz | |
[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index b46a5205ee7b..fd48db320f5b 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -433,19 +433,9 @@ 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*/ -unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); +int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); /* @@ -549,5 +539,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*/ |