From 8478bfdd7572672b36792effe05d43a3667574f9 Mon Sep 17 00:00:00 2001 From: Murali Karicheri Date: Sat, 12 Jun 2010 09:16:02 -0300 Subject: [PATCH] --- yaml --- r: 202067 b: refs/heads/master c: 2b5e45cdf9ffe53bf49d78414a9b36bb527fafe8 h: refs/heads/master i: 202065: 8f14f017739cabdab96eb93cdc22bdeee0b7ae73 202063: 04238268ffb70c65f32a634e1c4f08caef52f718 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/Kconfig | 33 ------------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/[refs] b/[refs] index f5a6c455792c..e12094732eac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 540069010decbf1723494fea5e6896debe4b5891 +refs/heads/master: 2b5e45cdf9ffe53bf49d78414a9b36bb527fafe8 diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index 280e76af6daa..11c256ba0395 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -517,19 +517,6 @@ config VIDEO_UPD64083 endmenu # encoder / decoder chips -config DISPLAY_DAVINCI_DM646X_EVM - tristate "DM646x EVM Video Display" - depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM - select VIDEOBUF_DMA_CONTIG - select VIDEO_DAVINCI_VPIF - select VIDEO_ADV7343 - select VIDEO_THS7303 - help - Support for DM6467 based display device. - - To compile this driver as a module, choose M here: the - module will be called vpif_display. - config VIDEO_SH_VOU tristate "SuperH VOU video output driver" depends on VIDEO_DEV && ARCH_SHMOBILE @@ -537,26 +524,6 @@ config VIDEO_SH_VOU help Support for the Video Output Unit (VOU) on SuperH SoCs. -config CAPTURE_DAVINCI_DM646X_EVM - tristate "DM646x EVM Video Capture" - depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM - select VIDEOBUF_DMA_CONTIG - select VIDEO_DAVINCI_VPIF - help - Support for DM6467 based capture device. - - To compile this driver as a module, choose M here: the - module will be called vpif_capture. - -config VIDEO_DAVINCI_VPIF - tristate "DaVinci VPIF Driver" - depends on DISPLAY_DAVINCI_DM646X_EVM - help - Support for DaVinci VPIF Driver. - - To compile this driver as a module, choose M here: the - module will be called vpif. - config VIDEO_VIVI tristate "Virtual Video Driver" depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64