diff options
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index e3c16c981e46..de09704d3dd2 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <acpi/acpi_drivers.h> | 40 | #include <acpi/acpi_drivers.h> |
41 | #include <acpi/acpi_numa.h> | 41 | #include <acpi/acpi_numa.h> |
42 | #include <asm/acpi.h> | 42 | #include <asm/acpi.h> |
43 | #include <linux/dmi.h> | ||
43 | 44 | ||
44 | 45 | ||
45 | #ifdef CONFIG_ACPI | 46 | #ifdef CONFIG_ACPI |
@@ -79,7 +80,6 @@ typedef int (*acpi_table_handler) (struct acpi_table_header *table); | |||
79 | typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); | 80 | typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); |
80 | 81 | ||
81 | char * __acpi_map_table (unsigned long phys_addr, unsigned long size); | 82 | char * __acpi_map_table (unsigned long phys_addr, unsigned long size); |
82 | unsigned long acpi_find_rsdp (void); | ||
83 | int acpi_boot_init (void); | 83 | int acpi_boot_init (void); |
84 | int acpi_boot_table_init (void); | 84 | int acpi_boot_table_init (void); |
85 | int acpi_numa_init (void); | 85 | int acpi_numa_init (void); |
@@ -192,7 +192,9 @@ extern int ec_transaction(u8 command, | |||
192 | #endif /*CONFIG_ACPI_EC*/ | 192 | #endif /*CONFIG_ACPI_EC*/ |
193 | 193 | ||
194 | extern int acpi_blacklisted(void); | 194 | extern int acpi_blacklisted(void); |
195 | extern void acpi_bios_year(char *s); | 195 | #ifdef CONFIG_DMI |
196 | extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d); | ||
197 | #endif | ||
196 | 198 | ||
197 | #ifdef CONFIG_ACPI_NUMA | 199 | #ifdef CONFIG_ACPI_NUMA |
198 | int acpi_get_pxm(acpi_handle handle); | 200 | int acpi_get_pxm(acpi_handle handle); |
@@ -226,5 +228,5 @@ static inline int acpi_boot_table_init(void) | |||
226 | return 0; | 228 | return 0; |
227 | } | 229 | } |
228 | 230 | ||
229 | #endif /* CONFIG_ACPI */ | 231 | #endif /* !CONFIG_ACPI */ |
230 | #endif /*_LINUX_ACPI_H*/ | 232 | #endif /*_LINUX_ACPI_H*/ |