diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 13:19:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 13:19:27 +1100 |
| commit | a8f7e9ee94aaec9a89f306876f998ea82c17d97b (patch) | |
| tree | 7184d24ee9c2ae07b475cf54b6c372e47052b434 /include | |
| parent | c763d64084fec619805d7d741fadcba88ae2151b (diff) | |
| parent | 47edff6884d4a08da144b27de468088f0c3820e7 (diff) | |
Merge remote branch 'acpi/test'
Conflicts:
drivers/pci/hotplug/acpiphp_glue.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpixf.h | 5 | ||||
| -rw-r--r-- | include/acpi/processor.h | 5 | ||||
| -rw-r--r-- | include/linux/acpi.h | 2 |
3 files changed, 7 insertions, 5 deletions
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 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20090903 +#define ACPI_CA_VERSION 0x20091112 #include "actypes.h" #include "actbl.h" @@ -154,7 +154,8 @@ acpi_status acpi_walk_namespace(acpi_object_type type, acpi_handle start_object, u32 max_depth, - acpi_walk_callback user_function, + acpi_walk_callback pre_order_visit, + acpi_walk_callback post_order_visit, void *context, void **return_value); acpi_status diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 740ac3ad8fd0..a920237f7c62 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -294,7 +294,7 @@ static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx #ifdef CONFIG_CPU_FREQ void acpi_processor_ppc_init(void); void acpi_processor_ppc_exit(void); -int acpi_processor_ppc_has_changed(struct acpi_processor *pr); +int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag); #else static inline void acpi_processor_ppc_init(void) { @@ -304,7 +304,8 @@ static inline void acpi_processor_ppc_exit(void) { return; } -static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr) +static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr, + int event_flag) { static unsigned int printout = 1; if (printout) { diff --git a/include/linux/acpi.h b/include/linux/acpi.h index dfcd920c3e54..c920d2def4d3 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -240,7 +240,7 @@ extern int pnpacpi_disabled; #define PXM_INVAL (-1) #define NID_INVAL (-1) -int acpi_check_resource_conflict(struct resource *res); +int acpi_check_resource_conflict(const struct resource *res); int acpi_check_region(resource_size_t start, resource_size_t n, const char *name); |