From 3b66d39180657613ed1bdf7783c50b6a7e35e134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20N=C3=A9meth?= <nm127@freemail.hu>
Date: Sat, 14 May 2011 19:27:33 +0200
Subject: [PATCH] --- yaml --- r: 253974 b: refs/heads/master c:
 6e33a852a37dee02979ec9d82bea26c07cee5bce h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/pci/acpi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f93de01b10a4..32507fc32d6d 100644
--- 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
index 0972315c3860..68c3c1395202 100644
--- 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;