From 861c91bae473d89d11bf38036dd68ee7cd33f9c4 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 2 Jul 2009 11:53:26 +0300 Subject: [PATCH 142/146] DSS2: VRFB: Add CONFIG_OMAP2_VRFB flag CONFIG_OMAP2_VRFB controls if VRFB is compiled in or not. Signed-off-by: Tomi Valkeinen --- arch/arm/plat-omap/Kconfig | 3 +++ arch/arm/plat-omap/Makefile | 3 ++- drivers/video/omap2/omapfb/Kconfig | 1 + 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index ca06037..2d6ae55 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -186,6 +186,9 @@ config OMAP_SERIAL_WAKE config OMAP2_VRAM bool +config OMAP2_VRFB + bool + endmenu endif diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 3232edc..462edf3 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -4,7 +4,7 @@ # Common support obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \ - usb.o fb.o vrfb.o io.o + usb.o fb.o io.o obj-m := obj-n := obj- := @@ -26,3 +26,4 @@ obj-y += $(i2c-omap-m) $(i2c-omap-y) obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o obj-$(CONFIG_OMAP2_VRAM) += vram.o +obj-$(CONFIG_OMAP2_VRFB) += vrfb.o diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig index 220c58b..bb694cc 100644 --- a/drivers/video/omap2/omapfb/Kconfig +++ b/drivers/video/omap2/omapfb/Kconfig @@ -3,6 +3,7 @@ menuconfig FB_OMAP2 depends on FB && OMAP2_DSS select OMAP2_VRAM + select OMAP2_VRFB select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT -- 1.6.2.4