diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 10:42:46 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 10:42:46 +0100 |
| commit | dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8 (patch) | |
| tree | fb198f6a52f4790ea2468a421fc8c91a3b3648c8 /arch/arm/mach-omap2/board-rx51.c | |
| parent | Merge tag 'v3.7-rc4' (diff) | |
| parent | OMAP: remove vram allocator (diff) | |
| download | linux-dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8.tar.xz linux-dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8.zip | |
Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux
Conflicts:
drivers/video/omap2/dss/Kconfig
drivers/video/omap2/omapfb/omapfb-ioctl.c
drivers/video/omap2/omapfb/omapfb-main.c
Merge changes to make omapfb use common dma_alloc, and remove omap's
custom vram allocator.
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 7bbb05d9689b..6e0de6f83278 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@ -34,8 +34,6 @@ #define RX51_GPIO_SLEEP_IND 162 -extern void rx51_video_mem_init(void); - static struct gpio_led gpio_leds[] = { { .name = "sleep_ind", @@ -112,7 +110,6 @@ static void __init rx51_init(void) static void __init rx51_reserve(void) { - rx51_video_mem_init(); omap_reserve(); } |