diff options
author | Len Brown <len.brown@intel.com> | 2009-09-19 10:14:45 +0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-09-19 10:14:45 +0400 |
commit | d26f0528d588e596955bf296a609afe52eafc099 (patch) | |
tree | 314f7a5637d5517a19f29d64a17e3459505def8f /include | |
parent | b963bd39c9000328f6ce4f12aa52abbb0c68ee91 (diff) | |
parent | df43176c934f2bc01f7615a6e20a4b8e77dcdd11 (diff) | |
download | linux-d26f0528d588e596955bf296a609afe52eafc099.tar.xz |
Merge branch 'misc-2.6.32' into release
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/acpi.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3fce811bf9ac..dfcd920c3e54 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -41,8 +41,6 @@ #include <acpi/acpi_drivers.h> #include <acpi/acpi_numa.h> #include <asm/acpi.h> -#include <linux/dmi.h> - enum acpi_irq_model_id { ACPI_IRQ_MODEL_PIC = 0, @@ -219,10 +217,8 @@ static inline int acpi_video_display_switch_support(void) #endif /* defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) */ extern int acpi_blacklisted(void); -#ifdef CONFIG_DMI extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d); extern int acpi_osi_setup(char *str); -#endif #ifdef CONFIG_ACPI_NUMA int acpi_get_pxm(acpi_handle handle); |