diff options
author | Tony Lindgren <tony@atomide.com> | 2009-09-03 10:17:39 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-09-03 10:17:39 -0700 |
commit | 1f685b36dbf27db55072fb738aac57aaf37d2c71 (patch) | |
tree | 43cdcd1288d3bfa042a7cd6a89d2bf40f9b0261e /arch/arm/mach-omap2/board-rx51.c | |
parent | 5567fa1f543dde3c42f8e52bf4f7005135b24896 (diff) | |
parent | ca4caa4e1d45f9542fa54263974d0ef637157b4a (diff) |
Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
-rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index c0d13401425..f9196c3b1a7 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@ -56,6 +56,8 @@ static struct omap_board_config_kernel rx51_config[] = { static void __init rx51_init_irq(void) { + omap_board_config = rx51_config; + omap_board_config_size = ARRAY_SIZE(rx51_config); omap2_init_common_hw(NULL, NULL); omap_init_irq(); omap_gpio_init(); @@ -65,8 +67,6 @@ extern void __init rx51_peripherals_init(void); static void __init rx51_init(void) { - omap_board_config = rx51_config; - omap_board_config_size = ARRAY_SIZE(rx51_config); omap_serial_init(); usb_musb_init(); rx51_peripherals_init(); |