diff options
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acpi_hest.h | 12 | ||||
-rw-r--r-- | include/acpi/acpixf.h | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/include/acpi/acpi_hest.h b/include/acpi/acpi_hest.h new file mode 100644 index 000000000000..63194d03cb2d --- /dev/null +++ b/include/acpi/acpi_hest.h | |||
@@ -0,0 +1,12 @@ | |||
1 | #ifndef __ACPI_HEST_H | ||
2 | #define __ACPI_HEST_H | ||
3 | |||
4 | #include <linux/pci.h> | ||
5 | |||
6 | #ifdef CONFIG_ACPI | ||
7 | extern int acpi_hest_firmware_first_pci(struct pci_dev *pci); | ||
8 | #else | ||
9 | static inline int acpi_hest_firmware_first_pci(struct pci_dev *pci) { return 0; } | ||
10 | #endif | ||
11 | |||
12 | #endif | ||
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index e723b0fd8e41..5e1ad3cd1bbd 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | /* Current ACPICA subsystem version in YYYYMMDD format */ | 48 | /* Current ACPICA subsystem version in YYYYMMDD format */ |
49 | 49 | ||
50 | #define ACPI_CA_VERSION 0x20090903 | 50 | #define ACPI_CA_VERSION 0x20091112 |
51 | 51 | ||
52 | #include "actypes.h" | 52 | #include "actypes.h" |
53 | #include "actbl.h" | 53 | #include "actbl.h" |
@@ -154,7 +154,8 @@ acpi_status | |||
154 | acpi_walk_namespace(acpi_object_type type, | 154 | acpi_walk_namespace(acpi_object_type type, |
155 | acpi_handle start_object, | 155 | acpi_handle start_object, |
156 | u32 max_depth, | 156 | u32 max_depth, |
157 | acpi_walk_callback user_function, | 157 | acpi_walk_callback pre_order_visit, |
158 | acpi_walk_callback post_order_visit, | ||
158 | void *context, void **return_value); | 159 | void *context, void **return_value); |
159 | 160 | ||
160 | acpi_status | 161 | acpi_status |