path: root/Documentation
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-15 08:42:07 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-15 08:42:07 -0800
commit70231669596fdd76dddfc2a4f53415d3dd84377e (patch)
treefead4ba8df3af3461038d1e319cfeefd7c970e78 /Documentation
parent58e89c274f202d7fd59694b7b74fa676018435a2 (diff)
parentdce1431cb36338bda1167591689ab1f77ccf8934 (diff)
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')
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/arm/OMAP/DSS b/Documentation/arm/OMAP/DSS
index 0af0e9eed5d..888ae7b83ae 100644
--- a/Documentation/arm/OMAP/DSS
+++ b/Documentation/arm/OMAP/DSS
@@ -255,9 +255,10 @@ framebuffer parameters.
Kernel boot arguments
- - Amount of total VRAM to preallocate. For example, "10M". omapfb
- allocates memory for framebuffers from VRAM.
+ - Amount of total VRAM to preallocate and optionally a physical start
+ memory address. For example, "10M". omapfb allocates memory for
+ framebuffers from VRAM.
- Default video mode for specified displays. For example,