diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 08:42:07 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 08:42:07 -0800 |
commit | 70231669596fdd76dddfc2a4f53415d3dd84377e (patch) | |
tree | fead4ba8df3af3461038d1e319cfeefd7c970e78 /Documentation | |
parent | 58e89c274f202d7fd59694b7b74fa676018435a2 (diff) | |
parent | dce1431cb36338bda1167591689ab1f77ccf8934 (diff) | |
download | linux-70231669596fdd76dddfc2a4f53415d3dd84377e.tar.gz linux-70231669596fdd76dddfc2a4f53415d3dd84377e.tar.bz2 linux-70231669596fdd76dddfc2a4f53415d3dd84377e.zip |
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:
fsl-diu-fb: drop dead ioctl define
MAINTAINERS: Add an fbdev git tree entry.
OMAP: DSS: Fix documentation regarding 'vram' kernel parameter
OMAP: VRAM: Fix boot-time memory allocation
OMAP: VRAM: improve VRAM error prints
sisfb: limit POST memory test according to PCI resource length
fbdev: sh_mobile_lcdc: use correct number of modes, when using the default
fbdev: sh_mobile_lcdc: use the standard CEA-861 720p timing
fbdev: sh_mobile_hdmi: properly clean up modedb on monitor unplug
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/arm/OMAP/DSS | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/arm/OMAP/DSS b/Documentation/arm/OMAP/DSS index 0af0e9eed5d6..888ae7b83ae4 100644 --- a/Documentation/arm/OMAP/DSS +++ b/Documentation/arm/OMAP/DSS @@ -255,9 +255,10 @@ framebuffer parameters. Kernel boot arguments --------------------- -vram=<size> - - Amount of total VRAM to preallocate. For example, "10M". omapfb - allocates memory for framebuffers from VRAM. +vram=<size>[,<physaddr>] + - Amount of total VRAM to preallocate and optionally a physical start + memory address. For example, "10M". omapfb allocates memory for + framebuffers from VRAM. omapfb.mode=<display>:<mode>[,...] - Default video mode for specified displays. For example, |