---

yaml --- r: 261154 b: refs/heads/master c: 43d786e h: refs/heads/master v: v3
git-mirror · Jul 22, 2011 · 4bd8a39 · 4bd8a39
1 parent 15837f3
commit 4bd8a39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1a98b695b4efe10067d0e1cb5b66146a4e517bf
+refs/heads/master: 43d786ed4df4c54cb8802a523748a7d78130a2cb
diff --git a/trunk/arch/x86/pci/acpi.c b/trunk/arch/x86/pci/acpi.c
@@ -246,10 +246,9 @@ static void add_resources(struct pci_root_info *info)
 
 		conflict = insert_resource_conflict(root, res);
 		if (conflict)
-			dev_err(&info->bridge->dev,
-				"address space collision: host bridge window %pR "
-				"conflicts with %s %pR\n",
-				res, conflict->name, conflict);
+			dev_info(&info->bridge->dev,
+				 "ignoring host bridge window %pR (conflicts with %s %pR)\n",
+				 res, conflict->name, conflict);
 		else
 			pci_bus_add_resource(info->bus, res, 0);
 	}