diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/arm/OMAP/DSS | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/arm/OMAP/DSS')
| -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. | |||
| 255 | Kernel boot arguments | 255 | Kernel boot arguments |
| 256 | --------------------- | 256 | --------------------- |
| 257 | 257 | ||
| 258 | vram=<size> | 258 | vram=<size>[,<physaddr>] |
| 259 | - Amount of total VRAM to preallocate. For example, "10M". omapfb | 259 | - Amount of total VRAM to preallocate and optionally a physical start |
| 260 | allocates memory for framebuffers from VRAM. | 260 | memory address. For example, "10M". omapfb allocates memory for |
| 261 | framebuffers from VRAM. | ||
| 261 | 262 | ||
| 262 | omapfb.mode=<display>:<mode>[,...] | 263 | omapfb.mode=<display>:<mode>[,...] |
| 263 | - Default video mode for specified displays. For example, | 264 | - Default video mode for specified displays. For example, |