diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/pci/acpi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 68c3c1395202..ae3cb23cd89b 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c | |||
| @@ -246,10 +246,9 @@ static void add_resources(struct pci_root_info *info) | |||
| 246 | 246 | ||
| 247 | conflict = insert_resource_conflict(root, res); | 247 | conflict = insert_resource_conflict(root, res); |
| 248 | if (conflict) | 248 | if (conflict) |
| 249 | dev_err(&info->bridge->dev, | 249 | dev_info(&info->bridge->dev, |
| 250 | "address space collision: host bridge window %pR " | 250 | "ignoring host bridge window %pR (conflicts with %s %pR)\n", |
| 251 | "conflicts with %s %pR\n", | 251 | res, conflict->name, conflict); |
| 252 | res, conflict->name, conflict); | ||
| 253 | else | 252 | else |
| 254 | pci_bus_add_resource(info->bus, res, 0); | 253 | pci_bus_add_resource(info->bus, res, 0); |
| 255 | } | 254 | } |