summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-09-30 06:54:14 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-10-03 15:13:24 -0300
commit06afc0ffe0023c4a378e255883c83eb996d1a8e6 (patch)
treec6ddd1f79acd7b2aeb4cd1636aac109b12e658f6 /drivers/media
parent025c5d66ad43bb53651379d0fb257daca568d3f9 (diff)
V4L/DVB (4660): Some cleanups at helper chips menu
Rearranged itens, so that decoders came first; cx25840 is, in fact, an audio and video decoder; Fixed some incorrect upercases; Removed the word "chip" for some audio processors at item name; Removed the word "driver" for some item names; Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/Kconfig130
1 files changed, 66 insertions, 64 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index d1183c939221..5c53fe62d38b 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -36,7 +36,7 @@ config VIDEO_HELPER_CHIPS_AUTO
menu "Encoders/decoders and other helper chips"
depends on VIDEO_DEV && !VIDEO_HELPER_CHIPS_AUTO
-comment "Audio Decoders"
+comment "Audio decoders"
config VIDEO_TVAUDIO
tristate "Simple audio decoder chips"
@@ -51,7 +51,7 @@ config VIDEO_TVAUDIO
module will be called tvaudio.
config VIDEO_TDA7432
- tristate "Philips TDA7432 audio processor chip"
+ tristate "Philips TDA7432 audio processor"
depends on VIDEO_V4L1 && I2C
---help---
Support for tda7432 audio decoder chip found on some bt8xx boards.
@@ -60,7 +60,7 @@ config VIDEO_TDA7432
module will be called tda7432.
config VIDEO_TDA9840
- tristate "Philips TDA9840 audio processor chip"
+ tristate "Philips TDA9840 audio processor"
depends on VIDEO_DEV && I2C
---help---
Support for tda9840 audio decoder chip found on some Zoran boards.
@@ -69,7 +69,7 @@ config VIDEO_TDA9840
module will be called tda9840.
config VIDEO_TDA9875
- tristate "Philips TDA9875 audio processor chip"
+ tristate "Philips TDA9875 audio processor"
depends on VIDEO_V4L1 && I2C
---help---
Support for tda9875 audio decoder chip found on some bt8xx boards.
@@ -78,7 +78,7 @@ config VIDEO_TDA9875
module will be called tda9875.
config VIDEO_TEA6415C
- tristate "Philips TEA6415C audio processor chip"
+ tristate "Philips TEA6415C audio processor"
depends on VIDEO_DEV && I2C
---help---
Support for tea6415c audio decoder chip found on some bt8xx boards.
@@ -87,7 +87,7 @@ config VIDEO_TEA6415C
module will be called tea6415c.
config VIDEO_TEA6420
- tristate "Philips TEA6420 audio processor chip"
+ tristate "Philips TEA6420 audio processor"
depends on VIDEO_DEV && I2C
---help---
Support for tea6420 audio decoder chip found on some bt8xx boards.
@@ -143,64 +143,10 @@ config VIDEO_WM8739
To compile this driver as a module, choose M here: the
module will be called wm8739.
-comment "MPEG video encoders"
-
-config VIDEO_CX2341X
- tristate "Conexant CX2341x MPEG encoders"
- depends on VIDEO_V4L2 && EXPERIMENTAL
- ---help---
- Support for the Conexant CX23416 MPEG encoders
- and CX23415 MPEG encoder/decoders.
-
- This module currently supports the encoding functions only.
-
- To compile this driver as a module, choose M here: the
- module will be called cx2341x.
-
-source "drivers/media/video/cx25840/Kconfig"
-
-comment "Video encoders"
-
-config VIDEO_SAA7127
- tristate "Philips SAA7127/9 digital video encoders"
- depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
- ---help---
- Support for the Philips SAA7127/9 digital video encoders.
-
- To compile this driver as a module, choose M here: the
- module will be called saa7127.
-
-config VIDEO_SAA7185
- tristate "Philips SAA7185 video encoder"
- depends on VIDEO_V4L1 && I2C
- ---help---
- Support for the Philips SAA7185 video encoder.
-
- To compile this driver as a module, choose M here: the
- module will be called saa7185.
-
-config VIDEO_ADV7170
- tristate "Analog Devices ADV7170 video encoder driver"
- depends on VIDEO_V4L1 && I2C
- ---help---
- Support for the Analog Devices ADV7170 video encoder driver
-
- To compile this driver as a module, choose M here: the
- module will be called adv7170.
-
-config VIDEO_ADV7175
- tristate "Analog Devices ADV7175 video encoder driver"
- depends on VIDEO_V4L1 && I2C
- ---help---
- Support for the Analog Devices ADV7175 video encoder driver
-
- To compile this driver as a module, choose M here: the
- module will be called adv7175.
-
comment "Video decoders"
config VIDEO_BT819
- tristate "BT819A VideoStream Decoder"
+ tristate "BT819A VideoStream decoder"
depends on VIDEO_V4L1 && I2C
---help---
Support for BT819A video decoder.
@@ -209,7 +155,7 @@ config VIDEO_BT819
module will be called bt819.
config VIDEO_BT856
- tristate "BT856 VideoStream Decoder"
+ tristate "BT856 VideoStream decoder"
depends on VIDEO_V4L1 && I2C
---help---
Support for BT856 video decoder.
@@ -218,7 +164,7 @@ config VIDEO_BT856
module will be called bt856.
config VIDEO_BT866
- tristate "BT866 VideoStream Decoder"
+ tristate "BT866 VideoStream decoder"
depends on VIDEO_V4L1 && I2C
---help---
Support for BT866 video decoder.
@@ -295,7 +241,7 @@ config VIDEO_TVP5150
module will be called tvp5150.
config VIDEO_VPX3220
- tristate "vpx3220a, vpx3216b & vpx3214c video decoder driver"
+ tristate "vpx3220a, vpx3216b & vpx3214c video decoders"
depends on VIDEO_V4L1 && I2C
---help---
Support for VPX322x video decoders.
@@ -303,6 +249,62 @@ config VIDEO_VPX3220
To compile this driver as a module, choose M here: the
module will be called vpx3220.
+comment "Video and audio decoders"
+
+source "drivers/media/video/cx25840/Kconfig"
+
+comment "MPEG video encoders"
+
+config VIDEO_CX2341X
+ tristate "Conexant CX2341x MPEG encoders"
+ depends on VIDEO_V4L2 && EXPERIMENTAL
+ ---help---
+ Support for the Conexant CX23416 MPEG encoders
+ and CX23415 MPEG encoder/decoders.
+
+ This module currently supports the encoding functions only.
+
+ To compile this driver as a module, choose M here: the
+ module will be called cx2341x.
+
+comment "Video encoders"
+
+config VIDEO_SAA7127
+ tristate "Philips SAA7127/9 digital video encoders"
+ depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+ ---help---
+ Support for the Philips SAA7127/9 digital video encoders.
+
+ To compile this driver as a module, choose M here: the
+ module will be called saa7127.
+
+config VIDEO_SAA7185
+ tristate "Philips SAA7185 video encoder"
+ depends on VIDEO_V4L1 && I2C
+ ---help---
+ Support for the Philips SAA7185 video encoder.
+
+ To compile this driver as a module, choose M here: the
+ module will be called saa7185.
+
+config VIDEO_ADV7170
+ tristate "Analog Devices ADV7170 video encoder"
+ depends on VIDEO_V4L1 && I2C
+ ---help---
+ Support for the Analog Devices ADV7170 video encoder driver
+
+ To compile this driver as a module, choose M here: the
+ module will be called adv7170.
+
+config VIDEO_ADV7175
+ tristate "Analog Devices ADV7175 video encoder"
+ depends on VIDEO_V4L1 && I2C
+ ---help---
+ Support for the Analog Devices ADV7175 video encoder driver
+
+ To compile this driver as a module, choose M here: the
+ module will be called adv7175.
+
comment "Video improvement chips"
config VIDEO_UPD64031A