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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ep93xx
/
include
/
mach
/
ep93xx-regs.h
diff --git
a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
index 93e2ecc79ceb14896e2665acc97a15eac0fd162d..b1e096f0c2d2ff59b4ef2428003b9340f507d12d 100644
(file)
--- a/
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
+++ b/
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
@@
-106,6
+106,7
@@
#define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000)
+#define EP93XX_SPI_PHYS_BASE EP93XX_APB_PHYS(0x000a0000)
#define EP93XX_SPI_BASE EP93XX_APB_IOMEM(0x000a0000)
#define EP93XX_IRDA_BASE EP93XX_APB_IOMEM(0x000b0000)