[PATCH] v4l: 854: move cx88 and saa7134 configuration

- Move cx88 and saa7134 configuration out of
  drivers/media/video/Kconfig and instead, use
  new Kconfig files in each respective directory.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 51 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bbb989df4cf0..882791b14ef8 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -243,29 +243,7 @@ config VIDEO_MEYE
           To compile this driver as a module, choose M here: the
           module will be called meye.
 
-config VIDEO_SAA7134
-        tristate "Philips SAA7134 support"
-        depends on VIDEO_DEV && PCI && I2C && SOUND
-        select VIDEO_BUF
-        select VIDEO_IR
-        select VIDEO_TUNER
-        select CRC32
-        ---help---
-          This is a video4linux driver for Philips SAA7130/7134 based
-          TV cards.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7134.
-
-config VIDEO_SAA7134_DVB
-        tristate "DVB Support for saa7134 based TV cards"
-        depends on VIDEO_SAA7134 && DVB_CORE
-        select VIDEO_BUF_DVB
-        select DVB_MT352
-        select DVB_TDA1004X
-        ---help---
-          This adds support for DVB cards based on the
-          Philips saa7134 chip.
+source "drivers/media/video/saa7134/Kconfig"
 
 config VIDEO_MXB
         tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
@@ -316,34 +294,7 @@ config VIDEO_HEXIUM_GEMINI
           To compile this driver as a module, choose M here: the
           module will be called hexium_gemini.
 
-config VIDEO_CX88
-        tristate "Conexant 2388x (bt878 successor) support"
-        depends on VIDEO_DEV && PCI && I2C && EXPERIMENTAL
-        select I2C_ALGOBIT
-        select FW_LOADER
-        select VIDEO_BTCX
-        select VIDEO_BUF
-        select VIDEO_TUNER
-        select VIDEO_TVEEPROM
-        select VIDEO_IR
-        ---help---
-          This is a video4linux driver for Conexant 2388x based
-          TV cards.
-
-          To compile this driver as a module, choose M here: the
-          module will be called cx8800
-
-config VIDEO_CX88_DVB
-        tristate "DVB Support for cx2388x based TV cards"
-        depends on VIDEO_CX88 && DVB_CORE
-        select VIDEO_BUF_DVB
-        select DVB_MT352
-        select DVB_OR51132
-        select DVB_CX22702
-        select DVB_LGDT330X
-        ---help---
-          This adds support for DVB/ATSC cards based on the
-          Connexant 2388x chip.
+source "drivers/media/video/cx88/Kconfig"
 
 config VIDEO_OVCAMCHIP
         tristate "OmniVision Camera Chip support"