diff options
| author | Len Brown | 2009-12-16 20:22:32 +0100 |
|---|---|---|
| committer | Len Brown | 2009-12-16 20:22:32 +0100 |
| commit | aa96ce0af8385415a3450bc13e6254a4d6b4a888 (patch) | |
| tree | 5d255bc416d469b4d2110910586c43fc6474d51e /drivers/acpi/osl.c | |
| parent | Merge branch 'osc' into release (diff) | |
| parent | ACPI processor: Fix section mismatch for processor_add() (diff) | |
| download | kernel-qcow2-linux-aa96ce0af8385415a3450bc13e6254a4d6b4a888.tar.gz kernel-qcow2-linux-aa96ce0af8385415a3450bc13e6254a4d6b4a888.tar.xz kernel-qcow2-linux-aa96ce0af8385415a3450bc13e6254a4d6b4a888.zip | |
Merge branch 'misc-2.6.33' into release
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 7c1c59ea9ec6..02e8464e480f 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1118,7 +1118,7 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup); /* 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; |