Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aeb3be3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fbdev-fixes-for-linus' of... 

Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6

* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
  OMAP: OMAPFB: disable old omapfb for OMAP4 builds
  OMAP: DSS: VRAM: Align start & size of vram to 2M
parents 07058599 e13416ae

drivers/video/omap/Kconfig

+2 −2
Original line number Diff line number Diff line 
config FB_OMAP

	tristate "OMAP frame buffer support (EXPERIMENTAL)"

	depends on FB && ARCH_OMAP && (OMAP2_DSS = "n")



	depends on FB && (OMAP2_DSS = "n")

	depends on ARCH_OMAP1 || ARCH_OMAP2 || ARCH_OMAP3

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

drivers/video/omap2/vram.c

+2 −2
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ void __init omap_vram_reserve_sdram_memblock(void) 
	if (!size)

		return;



	size = PAGE_ALIGN(size);

	size = ALIGN(size, SZ_2M);



	if (paddr) {

		if (paddr & ~PAGE_MASK) {
@@ -576,7 +576,7 @@ void __init omap_vram_reserve_sdram_memblock(void) 
			return;

		}

	} else {

		paddr = memblock_alloc(size, PAGE_SIZE);

		paddr = memblock_alloc(size, SZ_2M);

	}



	memblock_free(paddr, size);