diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
| commit | ebe8912be214662c8289977fb416c1f015df4a0b (patch) | |
| tree | cb82c552c602e5ae1a4bd8c11bd171bf88a58c35 /drivers/acpi/osl.c | |
| parent | 50531444fac593c8c8e3ff2e41944d9507bb4665 (diff) | |
| parent | dba92d3bc49c036056a48661d2d8fefe4c78375a (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 8edba7b678eb..065819ba87c7 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -1237,7 +1237,7 @@ int acpi_check_resource_conflict(struct resource *res) | |||
| 1237 | 1237 | ||
| 1238 | if (clash) { | 1238 | if (clash) { |
| 1239 | if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) { | 1239 | if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) { |
| 1240 | printk(KERN_INFO "%sACPI: %s resource %s [0x%llx-0x%llx]" | 1240 | printk("%sACPI: %s resource %s [0x%llx-0x%llx]" |
| 1241 | " conflicts with ACPI region %s" | 1241 | " conflicts with ACPI region %s" |
| 1242 | " [0x%llx-0x%llx]\n", | 1242 | " [0x%llx-0x%llx]\n", |
| 1243 | acpi_enforce_resources == ENFORCE_RESOURCES_LAX | 1243 | acpi_enforce_resources == ENFORCE_RESOURCES_LAX |