lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'devel-board' into omap-for-linus

Browse Source
This commit is contained in:
Tony Lindgren
2010-12-17 15:14:02 -08:00
parent df127ee375 2d200665c3
commit fea83f6a9b
332 changed files with 3349 additions and 1838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-omap2/board-rx51.c
View File

@@ -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();
}