git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-kirkwood
/
include
/
mach
/
io.h
diff --git
a/arch/arm/mach-kirkwood/include/mach/io.h
b/arch/arm/mach-kirkwood/include/mach/io.h
index a643a846d5fb3252a368c3e3a2d7c2d50f817233..44e8be04f25929b6ef792ac75af0b540a09841d5 100644
(file)
--- a/
arch/arm/mach-kirkwood/include/mach/io.h
+++ b/
arch/arm/mach-kirkwood/include/mach/io.h
@@
-15,7
+15,7
@@
static inline void __iomem *__io(unsigned long addr)
{
- return (void __iomem *)((addr - KIRKWOOD_PCIE_IO_
PHY
S_BASE)
+ return (void __iomem *)((addr - KIRKWOOD_PCIE_IO_
BU
S_BASE)
+ KIRKWOOD_PCIE_IO_VIRT_BASE);
}