---

yaml --- r: 253974 b: refs/heads/master c: 6e33a85 h: refs/heads/master v: v3
git-mirror · Jun 1, 2011 · 3b66d39 · 3b66d39
1 parent a4334c5
commit 3b66d39
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f37d6229ca309f96b163b943ff982f4697630cd
+refs/heads/master: 6e33a852a37dee02979ec9d82bea26c07cee5bce
diff --git a/trunk/arch/x86/pci/acpi.c b/trunk/arch/x86/pci/acpi.c
@@ -188,7 +188,7 @@ static bool resource_contains(struct resource *res, resource_size_t point)
 	return false;
 }
 
-static void coalesce_windows(struct pci_root_info *info, int type)
+static void coalesce_windows(struct pci_root_info *info, unsigned long type)
 {
 	int i, j;
 	struct resource *res1, *res2;