diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-20 09:49:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-20 09:49:54 -0800 |
| commit | 7aeb3be341cc7f1fbf2b98fbef980a816736fe8e (patch) | |
| tree | 38be8872bfd928fd128e64a8ea9754effb0c7220 | |
| parent | 07058599b486fe342f371200ac4718fedbe9a354 (diff) | |
| parent | e13416ae7f378f9963ceca596ac464d4120093f3 (diff) | |
| download | op-kernel-dev-7aeb3be341cc7f1fbf2b98fbef980a816736fe8e.zip op-kernel-dev-7aeb3be341cc7f1fbf2b98fbef980a816736fe8e.tar.gz | |
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
| -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); |
