diff options
| author | Tony Lindgren <tony@atomide.com> | 2008-10-06 15:49:36 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-10-06 15:49:36 +0300 |
| commit | 646e3ed1a349fbccce651fed2d3987f0e7b0f0f4 (patch) | |
| tree | b9c4d52027da1468e52294f3f8db3afb0720c86d /arch/arm/mach-omap1 | |
| parent | fd1dc87ded0f29c1ba1e8da62f03ab0d591d9bdd (diff) | |
| download | blackbird-op-linux-646e3ed1a349fbccce651fed2d3987f0e7b0f0f4.tar.gz blackbird-op-linux-646e3ed1a349fbccce651fed2d3987f0e7b0f0f4.zip | |
ARM: OMAP2: Misc updates from linux-omap tree
Misc updates from linux-omap tree, mostly to update common
device initialization and add missing defines from linux-omap
tree. Also some changes to make room for adding 34xx in
following patches.
Note that the I2C resources are now set up in
arch/arm/plat-omap/i2c.c helper, and can be removed
from devices.c.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index ab708d4c597e..79cfe0147d93 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -101,7 +101,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[] = { |
