kbuild: move files that don't check __KERNEL__

[safe/jmp/linux-2.6] / drivers / media / Kconfig

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 28ee65c..128bb9c 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -25,11 +25,16 @@ config VIDEO_DEV
          To compile this driver as a module, choose M here: the
          module will be called videodev.
 
-config VIDEO_V4L1
+config VIDEO_V4L2_COMMON
+       tristate
+       depends on (I2C || I2C=n) && VIDEO_DEV
+       default (I2C || I2C=n) && VIDEO_DEV
+
+config VIDEO_ALLOW_V4L1
        bool "Enable Video For Linux API 1 (DEPRECATED)"
-       depends on VIDEO_DEV
+       depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+       default VIDEO_DEV && VIDEO_V4L2_COMMON
        select VIDEO_V4L1_COMPAT
-       default y
        ---help---
          Enables a compatibility API used by most V4L2 devices to allow
          its usage with legacy applications that supports only V4L1 api.
@@ -39,7 +44,7 @@ config VIDEO_V4L1
 config VIDEO_V4L1_COMPAT
        bool "Enable Video For Linux API 1 compatible Layer"
        depends on VIDEO_DEV
-       default y
+       default VIDEO_DEV
        ---help---
          This api were developed to be used at Kernel 2.2 and 2.4, but
          lacks support for several video standards. There are several
@@ -54,9 +59,14 @@ config VIDEO_V4L1_COMPAT
          If you are unsure as to whether this is required, answer Y.
 
 config VIDEO_V4L2
-       bool
-       depends on VIDEO_DEV
-       default y
+       tristate
+       depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+       default VIDEO_DEV && VIDEO_V4L2_COMMON
+
+config VIDEO_V4L1
+       tristate
+       depends on VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1
+       default VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1
 
 source "drivers/media/video/Kconfig"
 
@@ -69,11 +79,13 @@ source "drivers/media/common/Kconfig"
 config VIDEO_TUNER
        tristate
        depends on I2C
+       select TUNER_XC2028 if !VIDEO_TUNER_CUSTOMIZE
        select TUNER_MT20XX if !VIDEO_TUNER_CUSTOMIZE
        select TUNER_TDA8290 if !VIDEO_TUNER_CUSTOMIZE
        select TUNER_TEA5761 if !VIDEO_TUNER_CUSTOMIZE
        select TUNER_TEA5767 if !VIDEO_TUNER_CUSTOMIZE
        select TUNER_SIMPLE if !VIDEO_TUNER_CUSTOMIZE
+       select TUNER_TDA9887 if !VIDEO_TUNER_CUSTOMIZE
 
 menuconfig VIDEO_TUNER_CUSTOMIZE
        bool "Customize analog tuner modules to build"
@@ -89,6 +101,13 @@ menuconfig VIDEO_TUNER_CUSTOMIZE
 
 if VIDEO_TUNER_CUSTOMIZE
 
+config TUNER_XC2028
+       tristate "XCeive xc2028/xc3028 tuners"
+       depends on I2C && FW_LOADER
+       default m if VIDEO_TUNER_CUSTOMIZE
+       help
+         Say Y here to include support for the xc2028/xc3028 tuners.
+
 config TUNER_MT20XX
        tristate "Microtune 2032 / 2050 tuners"
        depends on I2C
@@ -97,8 +116,10 @@ config TUNER_MT20XX
          Say Y here to include support for the MT2032 / MT2050 tuner.
 
 config TUNER_TDA8290
-       tristate "TDA 8290+8275(a) tuner combo"
+       tristate "TDA 8290/8295 + 8275(a)/18271 tuner combo"
        depends on I2C
+       select DVB_TDA827X
+       select DVB_TDA18271
        default m if VIDEO_TUNER_CUSTOMIZE
        help
          Say Y here to include support for Philips TDA8290+8275(a) tuner.
@@ -120,23 +141,38 @@ config TUNER_TEA5767
 config TUNER_SIMPLE
        tristate "Simple tuner support"
        depends on I2C
+       select TUNER_TDA9887
        default m if VIDEO_TUNER_CUSTOMIZE
        help
          Say Y here to include support for various simple tuners.
 
+config TUNER_TDA9887
+       tristate "TDA 9885/6/7 analog IF demodulator"
+       depends on I2C
+       default m if VIDEO_TUNER_CUSTOMIZE
+       help
+         Say Y here to include support for Philips TDA9885/6/7
+         analog IF demodulator.
+
 endif # VIDEO_TUNER_CUSTOMIZE
 
 config VIDEOBUF_GEN
        tristate
 
 config VIDEOBUF_DMA_SG
-       depends on PCI
+       depends on HAS_DMA
        select VIDEOBUF_GEN
        tristate
 
-config VIDEO_BUF_DVB
+config VIDEOBUF_VMALLOC
+       select VIDEOBUF_GEN
        tristate
 
+config VIDEOBUF_DVB
+       tristate
+       select VIDEOBUF_GEN
+       select VIDEOBUF_DMA_SG
+
 config VIDEO_BTCX
        tristate
 
@@ -145,6 +181,7 @@ config VIDEO_IR_I2C
 
 config VIDEO_IR
        tristate
+       depends on INPUT
        select VIDEO_IR_I2C if I2C
 
 config VIDEO_TVEEPROM
@@ -153,7 +190,6 @@ config VIDEO_TVEEPROM
 
 config DAB
        boolean "DAB adapters"
-       default y
        ---help---
          Allow selecting support for for Digital Audio Broadcasting (DAB)
          Receiver adapters.