aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-29 20:38:45 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-29 17:41:38 -0400
commitf1784354f774e1fa4863fc6382296ef6ede26dc5 (patch)
treeadf0864e5d19850f6eecc29d6d91206880a5b0a0
parentb094516f9589245617eb5d0452769826063f72ac (diff)
Fix V4L/DVB core help messages
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/Kconfig34
1 files changed, 16 insertions, 18 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index b5664927df91..ddf57e135c6c 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -14,13 +14,11 @@ comment "Multimedia core support"
14config VIDEO_DEV 14config VIDEO_DEV
15 tristate "Video For Linux" 15 tristate "Video For Linux"
16 ---help--- 16 ---help---
17 Support for audio/video capture and overlay devices and FM radio 17 V4L core support for video capture and overlay devices, webcams and
18 cards. The exact capabilities of each device vary. 18 AM/FM radio cards.
19 19
20 This kernel includes support for the new Video for Linux Two API, 20 This kernel includes support for the new Video for Linux Two API,
21 (V4L2) as well as the original system. Drivers and applications 21 (V4L2).
22 need to be rewritten to use V4L2, but drivers for popular cards
23 and applications for most video capture functions already exist.
24 22
25 Additional info and docs are available on the web at 23 Additional info and docs are available on the web at
26 <http://linuxtv.org> 24 <http://linuxtv.org>
@@ -42,8 +40,11 @@ config VIDEO_ALLOW_V4L1
42 default VIDEO_DEV && VIDEO_V4L2_COMMON 40 default VIDEO_DEV && VIDEO_V4L2_COMMON
43 select VIDEO_V4L1_COMPAT 41 select VIDEO_V4L1_COMPAT
44 ---help--- 42 ---help---
45 Enables a compatibility API used by most V4L2 devices to allow 43 Enables drivers based on the legacy V4L1 API.
46 its usage with legacy applications that supports only V4L1 api. 44
45 This api were developed to be used at Kernel 2.2 and 2.4, but
46 lacks support for several video standards. There are several
47 drivers at kernel that still depends on it.
47 48
48 If you are unsure as to whether this is required, answer Y. 49 If you are unsure as to whether this is required, answer Y.
49 50
@@ -52,9 +53,8 @@ config VIDEO_V4L1_COMPAT
52 depends on VIDEO_DEV 53 depends on VIDEO_DEV
53 default VIDEO_DEV 54 default VIDEO_DEV
54 ---help--- 55 ---help---
55 This api were developed to be used at Kernel 2.2 and 2.4, but 56 Enables a compatibility API used by most V4L2 devices to allow
56 lacks support for several video standards. There are several 57 its usage with legacy applications that supports only V4L1 api.
57 drivers at kernel that still depends on it.
58 58
59 Documentation for the original API is included in the file 59 Documentation for the original API is included in the file
60 <Documentation/video4linux/API.html>. 60 <Documentation/video4linux/API.html>.
@@ -73,18 +73,16 @@ config DVB_CORE
73 depends on NET && INET 73 depends on NET && INET
74 select CRC32 74 select CRC32
75 help 75 help
76 Support Digital Video Broadcasting hardware. Enable this if you
77 own a DVB adapter and want to use it or if you compile Linux for
78 a digital SetTopBox.
79
80 DVB core utility functions for device handling, software fallbacks etc. 76 DVB core utility functions for device handling, software fallbacks etc.
81 Say Y when you have a DVB card and want to use it. Say Y if your want 77
82 to build your drivers outside the kernel, but need the DVB core. All 78 Enable this if you own a DVB/ATSC adapter and want to use it or if
83 in-kernel drivers will select this automatically if needed. 79 you compile Linux for a digital SetTopBox.
80
81 Say Y when you have a DVB or an ATSC card and want to use it.
84 82
85 API specs and user tools are available from <http://www.linuxtv.org/>. 83 API specs and user tools are available from <http://www.linuxtv.org/>.
86 84
87 Please report problems regarding this driver to the LinuxDVB 85 Please report problems regarding this support to the LinuxDVB
88 mailing list. 86 mailing list.
89 87
90 If unsure say N. 88 If unsure say N.