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 git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[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
a2d07aa
..
379100c
100644
(file)
--- a/
arch/arm/mach-omap1/devices.c
+++ b/
arch/arm/mach-omap1/devices.c
@@
-73,7
+73,7
@@
static inline void omap_init_rtc(void) {}
# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1
#endif
-#define OMAP1_MBOX_BASE OMAP1
_IO_ADDRESS(OMAP16XX_MAILBOX_BASE)
+#define OMAP1_MBOX_BASE OMAP1
6XX_MAILBOX_BASE
static struct resource mbox_resources[] = {
{