diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 +0000 |
commit | b580513e841d81eebf0d7b02f412be0882c2ce5f (patch) | |
tree | 9336a14058eed66c335db10512f33a31f9e8c938 /arch/arm/mach-omap1/board-osk.c | |
parent | 04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff) | |
parent | 418aade459f03318defd18ef0b11981a63bd81b0 (diff) | |
download | linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.gz linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.bz2 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-osk.c')
-rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index e5d126e8f276..543fa136106d 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -169,6 +169,7 @@ static void __init osk_init_cf(void) static void __init osk_init_irq(void) { + omap1_init_common_hw(); omap_init_irq(); omap_gpio_init(); osk_init_smc91x(); @@ -269,7 +270,7 @@ static void __init osk_init(void) static void __init osk_map_io(void) { - omap_map_common_io(); + omap1_map_common_io(); } MACHINE_START(OMAP_OSK, "TI-OSK") |