summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-perseus2.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-02-10 16:53:29 +0000
committerSteve French <sfrench@us.ibm.com>2006-02-10 16:53:29 +0000
commitb580513e841d81eebf0d7b02f412be0882c2ce5f (patch)
tree9336a14058eed66c335db10512f33a31f9e8c938 /arch/arm/mach-omap1/board-perseus2.c
parent04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff)
parent418aade459f03318defd18ef0b11981a63bd81b0 (diff)
downloadblackbird-op-linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.gz
blackbird-op-linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-perseus2.c')
-rw-r--r--arch/arm/mach-omap1/board-perseus2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 88708a0c52a2..3913a3cc0ce6 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -144,6 +144,7 @@ static void __init perseus2_init_smc91x(void)
void omap_perseus2_init_irq(void)
{
+ omap1_init_common_hw();
omap_init_irq();
omap_gpio_init();
perseus2_init_smc91x();
@@ -160,7 +161,7 @@ static struct map_desc omap_perseus2_io_desc[] __initdata = {
static void __init omap_perseus2_map_io(void)
{
- omap_map_common_io();
+ omap1_map_common_io();
iotable_init(omap_perseus2_io_desc,
ARRAY_SIZE(omap_perseus2_io_desc));
OpenPOWER on IntegriCloud