diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-17 15:14:02 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-17 15:14:02 -0800 |
commit | fea83f6a9b0a90fefca16ac3534e308f6c34144b (patch) | |
tree | 3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /arch/arm/mach-omap2/board-rx51.c | |
parent | df127ee375af4cb40b979605e0c336fc79bd38e7 (diff) | |
parent | 2d200665c37f544f648d77a05a06ab63328f0d3a (diff) | |
download | linux-stable-fea83f6a9b0a90fefca16ac3534e308f6c34144b.tar.gz linux-stable-fea83f6a9b0a90fefca16ac3534e308f6c34144b.tar.bz2 linux-stable-fea83f6a9b0a90fefca16ac3534e308f6c34144b.zip |
Merge branch 'devel-board' into omap-for-linus
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 6635142d7d07..7362c91ddd76 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@ -32,10 +32,10 @@ #include "mux.h" #include "pm.h" +#include "sdram-nokia.h" #define RX51_GPIO_SLEEP_IND 162 -struct omap_sdrc_params *rx51_get_sdram_timings(void); extern void rx51_video_mem_init(void); static struct gpio_led gpio_leds[] = { @@ -105,7 +105,7 @@ static void __init rx51_init_irq(void) omap_board_config = rx51_config; omap_board_config_size = ARRAY_SIZE(rx51_config); omap3_pm_init_cpuidle(rx51_cpuidle_params); - sdrc_params = rx51_get_sdram_timings(); + sdrc_params = nokia_get_sdram_timings(); omap2_init_common_hw(sdrc_params, sdrc_params); omap_init_irq(); } |