diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 11:42:46 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 11:42:46 +0200 |
| commit | dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8 (patch) | |
| tree | fb198f6a52f4790ea2468a421fc8c91a3b3648c8 /drivers/video/omap2/dss | |
| parent | 3c3dd225819112e56554162c6b37e61a31924e0c (diff) | |
| parent | 966458f89d84ef5792893a01e2b7a5218c7b311d (diff) | |
Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux
Conflicts:
drivers/video/omap2/dss/Kconfig
drivers/video/omap2/omapfb/omapfb-ioctl.c
drivers/video/omap2/omapfb/omapfb-main.c
Merge changes to make omapfb use common dma_alloc, and remove omap's
custom vram allocator.
Diffstat (limited to 'drivers/video/omap2/dss')
| -rw-r--r-- | drivers/video/omap2/dss/Kconfig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig index 50e880260d8c..cb0f145c7077 100644 --- a/drivers/video/omap2/dss/Kconfig +++ b/drivers/video/omap2/dss/Kconfig @@ -5,18 +5,6 @@ menuconfig OMAP2_DSS if OMAP2_DSS -config OMAP2_VRAM_SIZE - int "VRAM size (MB)" - range 0 32 - default 0 - help - The amount of SDRAM to reserve at boot time for video RAM use. - This VRAM will be used by omapfb and other drivers that need - large continuous RAM area for video use. - - You can also set this with "vram=<bytes>" kernel argument, or - in the board file. - config OMAP2_DSS_DEBUG bool "Debug support" default n |