summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-05-07 09:48:57 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-05-07 09:48:57 +1000
commit17df18456dad41e0dddf601f56e7d93e4e5bbb83 (patch)
treeb3b797811607d73b9a2ff83d313f0db7586435e2 /include
parent728ab5ee47844f230d3a3fa4f452ddd25ee51762 (diff)
parent1e6c60beebdfe121c0246f11862b0b7441cbbf7b (diff)
Merge branch 'quilt/jdelvare-hwmon'
Diffstat (limited to 'include')
-rw-r--r--include/linux/acpi.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index b926afe8c03e..d05f629a7dfb 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -247,6 +247,8 @@ int acpi_check_region(resource_size_t start, resource_size_t n,
int acpi_check_mem_region(resource_size_t start, resource_size_t n,
const char *name);
+int acpi_resources_are_enforced(void);
+
#ifdef CONFIG_PM_SLEEP
void __init acpi_no_s4_hw_signature(void);
void __init acpi_old_suspend_ordering(void);