---

yaml --- r: 344645 b: refs/heads/master c: 966458f h: refs/heads/master i: 344643: 26cd47b v: v3
git-mirror · Nov 13, 2012 · a4edca1 · a4edca1
1 parent 52ed2da
commit a4edca1
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 574 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b022e17b1c7ec43f435fb568d38e888c65d6d77e
+refs/heads/master: 966458f89d84ef5792893a01e2b7a5218c7b311d
diff --git a/trunk/arch/arm/plat-omap/include/plat/vram.h b/trunk/arch/arm/plat-omap/include/plat/vram.h
diff --git a/trunk/drivers/video/omap2/Kconfig b/trunk/drivers/video/omap2/Kconfig
@@ -1,6 +1,3 @@
-config OMAP2_VRAM
-	bool
-
 config OMAP2_VRFB
 	bool
 

diff --git a/trunk/drivers/video/omap2/Makefile b/trunk/drivers/video/omap2/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_OMAP2_VRAM) += vram.o
 obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
 
 obj-$(CONFIG_OMAP2_DSS) += dss/

diff --git a/trunk/drivers/video/omap2/dss/Kconfig b/trunk/drivers/video/omap2/dss/Kconfig
@@ -6,18 +6,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_SUPPORT
         bool "Debug support"
 	default y