diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-16 14:38:41 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-16 14:38:41 (GMT) |
| commit | e13416ae7f378f9963ceca596ac464d4120093f3 (patch) | |
| tree | d2cb3908fe6816cad851da7a914f404abd2cea76 /drivers/video | |
| parent | b0c3844d8af6b9f3f18f31e1b0502fbefa2166be (diff) | |
| parent | b99ddbf83c064382b145d2156cc819d1eb4fc54d (diff) | |
| download | linux-fsl-qoriq-e13416ae7f378f9963ceca596ac464d4120093f3.tar.xz | |
Merge branch 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-fixes-for-linus
* 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux:
OMAP: OMAPFB: disable old omapfb for OMAP4 builds
OMAP: DSS: VRAM: Align start & size of vram to 2M
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/video/omap2/vram.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig index 455c605..083c8fe 100644 --- a/drivers/video/omap/Kconfig +++ b/drivers/video/omap/Kconfig @@ -1,7 +1,7 @@ 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 diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c index 2fd7e52..9441e2e 100644 --- a/drivers/video/omap2/vram.c +++ b/drivers/video/omap2/vram.c @@ -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); |