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 current mainline tree into linux-omap tree
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
devices.c
diff --git
a/arch/arm/mach-omap1/devices.c
b/arch/arm/mach-omap1/devices.c
index
da8a3ac
..
15ab43c
100644
(file)
--- a/
arch/arm/mach-omap1/devices.c
+++ b/
arch/arm/mach-omap1/devices.c
@@
-102,7
+102,7
@@
static inline void omap_init_mbox(void) { }
#if defined(CONFIG_OMAP_STI)
-#define OMAP1_STI_BASE
IO_ADDRESS(0xfffea000)
+#define OMAP1_STI_BASE
0xfffea000
#define OMAP1_STI_CHANNEL_BASE (OMAP1_STI_BASE + 0x400)
static struct resource sti_resources[] = {