summaryrefslogtreecommitdiff
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-07-23 18:02:28 +0100
committerMark Brown <broonie@kernel.org>2018-07-23 18:02:28 +0100
commit0afdd676f6e575478634d961286094169adbc50d (patch)
treedc04a98e56287b9375626457c6cdd56062e5f899 /include/linux/acpi.h
parente594a0636b0213d058aec2406e13f276b70791ed (diff)
parenteef5ba1aa148ca5e6deb1e0aa1de797fa4e12cb7 (diff)
Merge branch 'i2c/smbus_xfer_unlock-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into regmap-4.19 for sccb dependency
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 4b35a66383f9..e54f40974eb0 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -443,6 +443,9 @@ int acpi_check_resource_conflict(const struct resource *res);
int acpi_check_region(resource_size_t start, resource_size_t n,
const char *name);
+acpi_status acpi_release_memory(acpi_handle handle, struct resource *res,
+ u32 level);
+
int acpi_resources_are_enforced(void);
#ifdef CONFIG_HIBERNATION