---

yaml --- r: 109806 b: refs/heads/master c: bdba4d6 h: refs/heads/master v: v3
git-mirror · Sep 11, 2008 · 0caf8ed · 0caf8ed
1 parent 09e6e5d
commit 0caf8ed
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: ebfb2c63405f2410897674f14e41c031c9302909
+refs/heads/master: bdba4d6b77fcc76f206986d7cc55f1feb20301f8
diff --git 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;
 }