---

yaml --- r: 31321 b: refs/heads/master c: da298d3 h: refs/heads/master i: 31319: 401f5c8 v: v3
git-mirror · Jun 29, 2006 · 6d04c71 · 6d04c71
1 parent 4820d97
commit 6d04c71
Show file tree

Hide file tree

Showing 45 changed files with 3,655 additions and 4,187 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6002e45045a190a112bc3bc2134d0ff4fac7ced7
+refs/heads/master: da298d3a4f01dbc10c54da75d6b5717a99fb9cbc
diff --git a/trunk/arch/sparc/kernel/ioport.c b/trunk/arch/sparc/kernel/ioport.c
@@ -26,7 +26,6 @@
  */
 
 #include <linux/config.h>
-#include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -41,7 +40,6 @@
 #include <asm/vaddrs.h>
 #include <asm/oplib.h>
 #include <asm/prom.h>
-#include <asm/of_device.h>
 #include <asm/sbus.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
@@ -145,21 +143,6 @@ void __iomem *sbus_ioremap(struct resource *phyres, unsigned long offset,
 	    phyres->start + offset, size, name);
 }
 
-void __iomem *of_ioremap(struct resource *res, unsigned long offset,
-			 unsigned long size, char *name)
-{
-	return _sparc_alloc_io(res->flags & 0xF,
-			       res->start + offset,
-			       size, name);
-}
-EXPORT_SYMBOL(of_ioremap);
-
-void of_iounmap(void __iomem *base, unsigned long size)
-{
-	iounmap(base);
-}
-EXPORT_SYMBOL(of_iounmap);
-
 /*
  */
 void sbus_iounmap(volatile void __iomem *addr, unsigned long size)