From 0caf8ed086c2413ea09d1c2cf238d301ea240200 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 10 Sep 2008 23:38:51 -0700
Subject: [PATCH] --- yaml --- r: 109806 b: refs/heads/master c:
 bdba4d6b77fcc76f206986d7cc55f1feb20301f8 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/sparc/kernel/of_device.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 04b7297bca0a..25b9023207a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebfb2c63405f2410897674f14e41c031c9302909
+refs/heads/master: bdba4d6b77fcc76f206986d7cc55f1feb20301f8
diff --git a/trunk/arch/sparc/kernel/of_device.c b/trunk/arch/sparc/kernel/of_device.c
index c481d45f97b7..f58c537446a8 100644
--- a/trunk/arch/sparc/kernel/of_device.c
+++ b/trunk/arch/sparc/kernel/of_device.c
@@ -241,7 +241,7 @@ static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna)
 	return of_bus_default_map(addr, range, na, ns, pna);
 }
 
-static unsigned int of_bus_sbus_get_flags(const u32 *addr)
+static unsigned long of_bus_sbus_get_flags(const u32 *addr, unsigned long flags)
 {
 	return IORESOURCE_MEM;
 }