acpi_check_resource_conflict doesn't change the resource

Commit Message

Jean Delvare Nov. 11, 2009, 2:22 p.m. UTC

None

Patch

--- linux-2.6.32-rc6.orig/drivers/acpi/osl.c	2009-09-28 10:28:34.000000000 +0200
+++ linux-2.6.32-rc6/drivers/acpi/osl.c	2009-11-11 15:13:30.000000000 +0100
@@ -1118,7 +1118,7 @@  __setup("acpi_enforce_resources=", acpi_
 
 /* Check for resource conflicts between ACPI OperationRegions and native
  * drivers */
-int acpi_check_resource_conflict(struct resource *res)
+int acpi_check_resource_conflict(const struct resource *res)
 {
 	struct acpi_res_list *res_list_elem;
 	int ioport;
--- linux-2.6.32-rc6.orig/include/linux/acpi.h	2009-09-28 10:29:17.000000000 +0200
+++ linux-2.6.32-rc6/include/linux/acpi.h	2009-11-11 15:13:09.000000000 +0100
@@ -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);