summaryrefslogtreecommitdiff
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-16 14:22:32 -0500
committerLen Brown <len.brown@intel.com>2009-12-16 14:22:32 -0500
commitaa96ce0af8385415a3450bc13e6254a4d6b4a888 (patch)
tree5d255bc416d469b4d2110910586c43fc6474d51e /include/linux/acpi.h
parent2900681b25d5a1a1a7b39ab66da3b8c6b1b0b7ad (diff)
parentbf8b4542f92c4d8222941b1cab055fa350ab2fb4 (diff)
Merge branch 'misc-2.6.33' into release
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index e11090d462d2..ce945d4845fc 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);