git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-rx51.c
diff --git
a/arch/arm/mach-omap2/board-rx51.c
b/arch/arm/mach-omap2/board-rx51.c
index
b155c36
..
1b86b5b
100644
(file)
--- a/
arch/arm/mach-omap2/board-rx51.c
+++ b/
arch/arm/mach-omap2/board-rx51.c
@@
-36,6
+36,7
@@
#define RX51_GPIO_SLEEP_IND 162
struct omap_sdrc_params *rx51_get_sdram_timings(void);
#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[] = {
{
static struct gpio_led gpio_leds[] = {
{
@@
-143,6
+144,7
@@
static void __init rx51_init(void)
static void __init rx51_map_io(void)
{
omap2_set_globals_343x();
static void __init rx51_map_io(void)
{
omap2_set_globals_343x();
+ rx51_video_mem_init();
omap34xx_map_common_io();
}
omap34xx_map_common_io();
}