diff options
| author | Len Brown <len.brown@intel.com> | 2003-09-14 16:34:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2003-09-14 16:34:00 -0400 |
| commit | d9c54c1d58d836c545e03cad78331b0168762003 (patch) | |
| tree | 9e32a3b5d6b522887470e69d4e25388cce667d90 /include/linux/acpi.h | |
| parent | 0179c339c2978c01ee6d22bb1693c18ca0a4f12f (diff) | |
sync 2.4.22 changes into 2.6
Note that this restores CONFIG_ACPI_HT_ONLY as a sub-set of CONFIG_ACPI rather than a dependency.
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3fd526160f1a..8e4eba21e7ea 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -373,6 +373,11 @@ extern int acpi_mp_config; #define acpi_mp_config 0 +static inline int acpi_boot_init(void) +{ + return 0; +} + #endif /*!CONFIG_ACPI_BOOT*/ @@ -419,10 +424,17 @@ int ec_write(u8 addr, u8 val); #endif /*CONFIG_ACPI_EC*/ -#ifdef CONFIG_ACPI +#ifdef CONFIG_ACPI_INTERPRETER int acpi_blacklisted(void); -#endif /*CONFIG_ACPI*/ +#else /*!CONFIG_ACPI_INTERPRETER*/ + +static inline int acpi_blacklisted(void) +{ + return 0; +} + +#endif /*!CONFIG_ACPI_INTERPRETER*/ #endif /*_LINUX_ACPI_H*/ |