diff options
| author | Len Brown <len.brown@intel.com> | 2008-01-23 23:50:01 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-01-23 23:50:01 -0500 |
| commit | 63eac9badbe35054c0ae61a9dbcf4830c7429040 (patch) | |
| tree | 2bea2d6df5f2dc9306c9fc17c8755ed3c56d4a12 /include | |
| parent | 3645ca8359328ea4c75bce4af54ad24028381f30 (diff) | |
| parent | a1bd4e35e8d9df24db7d7addd74cbfcc87ec9fb3 (diff) | |
Pull dmi-2.6.24 into release branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 7 | ||||
| -rw-r--r-- | include/linux/dmi.h | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index e3c16c981e4..63f2e6ed698 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -40,6 +40,7 @@ #include <acpi/acpi_drivers.h> #include <acpi/acpi_numa.h> #include <asm/acpi.h> +#include <linux/dmi.h> #ifdef CONFIG_ACPI @@ -192,7 +193,9 @@ extern int ec_transaction(u8 command, #endif /*CONFIG_ACPI_EC*/ extern int acpi_blacklisted(void); -extern void acpi_bios_year(char *s); +#ifdef CONFIG_DMI +extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d); +#endif #ifdef CONFIG_ACPI_NUMA int acpi_get_pxm(acpi_handle handle); @@ -226,5 +229,5 @@ static inline int acpi_boot_table_init(void) return 0; } -#endif /* CONFIG_ACPI */ +#endif /* !CONFIG_ACPI */ #endif /*_LINUX_ACPI_H*/ diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 00fc7a9c35e..5b42a659a30 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -78,6 +78,8 @@ extern const struct dmi_device * dmi_find_device(int type, const char *name, extern void dmi_scan_machine(void); extern int dmi_get_year(int field); extern int dmi_name_in_vendors(const char *str); +extern int dmi_available; +extern char *dmi_get_slot(int slot); #else @@ -87,6 +89,8 @@ static inline const struct dmi_device * dmi_find_device(int type, const char *na const struct dmi_device *from) { return NULL; } static inline int dmi_get_year(int year) { return 0; } static inline int dmi_name_in_vendors(const char *s) { return 0; } +#define dmi_available 0 +static inline char *dmi_get_slot(int slot) { return NULL; } #endif |