sh: convert /proc/cpu/aligmnent, /proc/cpu/kernel_alignment to seq_file

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

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 583d151..ba69bee 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -2,18 +2,29 @@
 # Multimedia device configuration
 #
 
-menu "Multimedia devices"
+menuconfig MEDIA_SUPPORT
+       tristate "Multimedia support"
+       depends on HAS_IOMEM
+       help
+         If you want to use Video for Linux, DVB for Linux, or DAB adapters,
+         enable this option and other options below.
+
+if MEDIA_SUPPORT
+
+comment "Multimedia core support"
+
+#
+# V4L core and enabled API's
+#
 
 config VIDEO_DEV
        tristate "Video For Linux"
        ---help---
-         Support for audio/video capture and overlay devices and FM radio
-         cards. The exact capabilities of each device vary.
+         V4L core support for video capture and overlay devices, webcams and
+         AM/FM radio cards.
 
          This kernel includes support for the new Video for Linux Two API,
-         (V4L2) as well as the original system. Drivers and applications
-         need to be rewritten to use V4L2, but drivers for popular cards
-         and applications for most video capture functions already exist.
+         (V4L2).
 
          Additional info and docs are available on the web at
          <http://linuxtv.org>
@@ -24,25 +35,31 @@ 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
-       select VIDEO_V4L1_COMPAT
-       default y
+       depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+       default VIDEO_DEV && VIDEO_V4L2_COMMON
        ---help---
-         Enables a compatibility API used by most V4L2 devices to allow
-         its usage with legacy applications that supports only V4L1 api.
+         Enables drivers based on the legacy V4L1 API.
+
+         This api were developed to be used at Kernel 2.2 and 2.4, but
+         lacks support for several video standards. There are several
+         drivers at kernel that still depends on it.
 
          If you are unsure as to whether this is required, answer Y.
 
 config VIDEO_V4L1_COMPAT
-       bool "Enable Video For Linux API 1 compatible Layer"
+       bool "Enable Video For Linux API 1 compatible Layer" if !VIDEO_ALLOW_V4L1
        depends on VIDEO_DEV
        default y
        ---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
-         drivers at kernel that still depends on it.
+         Enables a compatibility API used by most V4L2 devices to allow
+         its usage with legacy applications that supports only V4L1 api.
 
          Documentation for the original API is included in the file
          <Documentation/video4linux/API.html>.
@@ -52,39 +69,64 @@ config VIDEO_V4L1_COMPAT
 
          If you are unsure as to whether this is required, answer Y.
 
-config VIDEO_V4L2
-       tristate
-       default y
+#
+# DVB Core
+#
 
-source "drivers/media/video/Kconfig"
+config DVB_CORE
+       tristate "DVB for Linux"
+       depends on NET && INET
+       select CRC32
+       help
+         DVB core utility functions for device handling, software fallbacks etc.
 
-source "drivers/media/radio/Kconfig"
+         Enable this if you own a DVB/ATSC adapter and want to use it or if
+         you compile Linux for a digital SetTopBox.
 
-source "drivers/media/dvb/Kconfig"
+         Say Y when you have a DVB or an ATSC card and want to use it.
 
-source "drivers/media/common/Kconfig"
+         API specs and user tools are available from <http://www.linuxtv.org/>.
 
-config VIDEO_TUNER
-       tristate
+         Please report problems regarding this support to the LinuxDVB
+         mailing list.
 
-config VIDEO_BUF
-       tristate
+         If unsure say N.
 
-config VIDEO_BUF_DVB
+config VIDEO_MEDIA
        tristate
+       default (DVB_CORE && (VIDEO_DEV = n)) || (VIDEO_DEV && (DVB_CORE = n)) || (DVB_CORE && VIDEO_DEV)
 
-config VIDEO_BTCX
-       tristate
+comment "Multimedia drivers"
 
-config VIDEO_IR
-       tristate
+source "drivers/media/common/Kconfig"
 
-config VIDEO_TVEEPROM
-       tristate
+#
+# Tuner drivers for DVB and V4L
+#
 
-config VIDEO_CX2341X
-       tristate
+source "drivers/media/common/tuners/Kconfig"
+
+#
+# Video/Radio/Hybrid adapters
+#
+
+source "drivers/media/video/Kconfig"
+
+source "drivers/media/radio/Kconfig"
+
+#
+# DVB adapters
+#
+
+source "drivers/media/dvb/Kconfig"
+
+config DAB
+       boolean "DAB adapters"
+       ---help---
+         Allow selecting support for Digital Audio Broadcasting (DAB)
+         Receiver adapters.
 
+if DAB
 config USB_DABUSB
        tristate "DABUSB driver"
        depends on USB
@@ -98,5 +140,6 @@ config USB_DABUSB
 
          To compile this driver as a module, choose M here: the
          module will be called dabusb.
+endif # DAB
 
-endmenu
+endif # MEDIA_SUPPORT