git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
ioport.c
diff --git
a/arch/sparc/kernel/ioport.c
b/arch/sparc/kernel/ioport.c
index
00a3976
..
987ec67
100644
(file)
--- a/
arch/sparc/kernel/ioport.c
+++ b/
arch/sparc/kernel/ioport.c
@@
-153,7
+153,7
@@
void __iomem *of_ioremap(struct resource *res, unsigned long offset,
}
EXPORT_SYMBOL(of_ioremap);
-void of_iounmap(void __iomem *base, unsigned long size)
+void of_iounmap(
struct resource *res,
void __iomem *base, unsigned long size)
{
iounmap(base);
}