drivers/video/omap2/omapfb/omapfb-main.c · dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8 · Kirill Smelkov / linux

Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux · dcca5cf0

Tomi Valkeinen authored Nov 16, 2012

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.

dcca5cf0

omapfb-main.c 58.3 KB

Replace omapfb-main.c