From d84dccc3a21211ba9b1a8c224789ceaca16c8366 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 8 Feb 2006 22:06:47 +0000 Subject: [PATCH] --- yaml --- r: 20135 b: refs/heads/master c: 18f49ea207fbcf37f81395037f0dc1cacb2aac3c h: refs/heads/master i: 20133: a1f3663e7d2ee432b8886951c2a19cf24079b26c 20131: c1b1318636cb631031b7409b23484225653fbef6 20127: 0974f8487d1c09680d30d9ac208d1974f40318b8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-generic.c | 3 ++- trunk/arch/arm/mach-omap2/board-h4.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8688588138dd..26a4c91809ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87bd63f64790eb01a963e05fc5e9fbf366c9de6e +refs/heads/master: 18f49ea207fbcf37f81395037f0dc1cacb2aac3c diff --git a/trunk/arch/arm/mach-omap2/board-generic.c b/trunk/arch/arm/mach-omap2/board-generic.c index b937123e5c65..eaecbf422d8c 100644 --- a/trunk/arch/arm/mach-omap2/board-generic.c +++ b/trunk/arch/arm/mach-omap2/board-generic.c @@ -33,6 +33,7 @@ static void __init omap_generic_init_irq(void) { + omap2_init_common_hw(); omap_init_irq(); } @@ -64,7 +65,7 @@ static void __init omap_generic_init(void) static void __init omap_generic_map_io(void) { - omap_map_common_io(); + omap2_map_common_io(); } MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx") diff --git a/trunk/arch/arm/mach-omap2/board-h4.c b/trunk/arch/arm/mach-omap2/board-h4.c index c3c35d40378a..a300d634d8a5 100644 --- a/trunk/arch/arm/mach-omap2/board-h4.c +++ b/trunk/arch/arm/mach-omap2/board-h4.c @@ -136,6 +136,7 @@ static inline void __init h4_init_smc91x(void) static void __init omap_h4_init_irq(void) { + omap2_init_common_hw(); omap_init_irq(); omap_gpio_init(); h4_init_smc91x(); @@ -181,7 +182,7 @@ static void __init omap_h4_init(void) static void __init omap_h4_map_io(void) { - omap_map_common_io(); + omap2_map_common_io(); } MACHINE_START(OMAP_H4, "OMAP2420 H4 board")