diff options
| -rw-r--r-- | drivers/acpi/osl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 5633b86e3ed1..7c1c59ea9ec6 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -1161,7 +1161,13 @@ int acpi_check_resource_conflict(struct resource *res) | |||
| 1161 | res_list_elem->name, | 1161 | res_list_elem->name, |
| 1162 | (long long) res_list_elem->start, | 1162 | (long long) res_list_elem->start, |
| 1163 | (long long) res_list_elem->end); | 1163 | (long long) res_list_elem->end); |
| 1164 | printk(KERN_INFO "ACPI: Device needs an ACPI driver\n"); | 1164 | if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX) |
| 1165 | printk(KERN_NOTICE "ACPI: This conflict may" | ||
| 1166 | " cause random problems and system" | ||
| 1167 | " instability\n"); | ||
| 1168 | printk(KERN_INFO "ACPI: If an ACPI driver is available" | ||
| 1169 | " for this device, you should use it instead of" | ||
| 1170 | " the native driver\n"); | ||
| 1165 | } | 1171 | } |
| 1166 | if (acpi_enforce_resources == ENFORCE_RESOURCES_STRICT) | 1172 | if (acpi_enforce_resources == ENFORCE_RESOURCES_STRICT) |
| 1167 | return -EBUSY; | 1173 | return -EBUSY; |