aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/cinergyT2/Kconfig2
-rw-r--r--drivers/media/radio/Kconfig3
-rw-r--r--drivers/media/video/Kconfig2
-rw-r--r--drivers/media/video/cx88/Kconfig2
-rw-r--r--drivers/media/video/pwc/philips.txt4
5 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig
index b5cdd57ec6f5..3d778c5aba68 100644
--- a/drivers/media/dvb/cinergyT2/Kconfig
+++ b/drivers/media/dvb/cinergyT2/Kconfig
@@ -56,7 +56,7 @@ config DVB_CINERGYT2_QUERY_INTERVAL
56 measurements. 56 measurements.
57 57
58 Please keep in mind that these updates cause traffic on the tuner 58 Please keep in mind that these updates cause traffic on the tuner
59 control bus and thus may or may not affect receiption sensitivity. 59 control bus and thus may or may not affect reception sensitivity.
60 60
61 The default value should be a safe choice for common applications. 61 The default value should be a safe choice for common applications.
62 62
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 7015517e2c1b..6d96b17a7f81 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -195,8 +195,7 @@ config RADIO_MIROPCM20_RDS
195 ---help--- 195 ---help---
196 Choose Y here if you want to see RDS/RBDS information like 196 Choose Y here if you want to see RDS/RBDS information like
197 RadioText, Programme Service name, Clock Time and date, Programme 197 RadioText, Programme Service name, Clock Time and date, Programme
198 TYpe and Traffic Announcement/Programme identification. You also 198 Type and Traffic Announcement/Programme identification.
199 need to say Y to "miroSOUND PCM20 radio" and devfs!
200 199
201 It's not possible to read the raw RDS packets from the device, so 200 It's not possible to read the raw RDS packets from the device, so
202 the driver cant provide an V4L interface for this. But the 201 the driver cant provide an V4L interface for this. But the
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 5c53fe62d38b..afb734df6e05 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -353,7 +353,7 @@ config VIDEO_SAA6588
353 help 353 help
354 Support for Radio Data System (RDS) decoder. This allows seeing 354 Support for Radio Data System (RDS) decoder. This allows seeing
355 radio station identification transmitted using this standard. 355 radio station identification transmitted using this standard.
356 Currentlly, it works only with bt8x8 chips. 356 Currently, it works only with bt8x8 chips.
357 357
358 To compile this driver as a module, choose M here: the 358 To compile this driver as a module, choose M here: the
359 module will be called saa6588. 359 module will be called saa6588.
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 51d68f32aa06..0f9d96963618 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -69,6 +69,6 @@ config VIDEO_CX88_VP3054
69 depends on VIDEO_CX88_DVB && DVB_MT352 69 depends on VIDEO_CX88_DVB && DVB_MT352
70 ---help--- 70 ---help---
71 This adds DVB-T support for cards based on the 71 This adds DVB-T support for cards based on the
72 Connexant 2388x chip and the MT352 demodulator, 72 Conexant 2388x chip and the MT352 demodulator,
73 which also require support for the VP-3054 73 which also require support for the VP-3054
74 Secondary I2C bus, such at DNTV Live! DVB-T Pro. 74 Secondary I2C bus, such at DNTV Live! DVB-T Pro.
diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt
index 11f751a6bda5..f5e848410311 100644
--- a/drivers/media/video/pwc/philips.txt
+++ b/drivers/media/video/pwc/philips.txt
@@ -175,8 +175,8 @@ dev_hint
175 - If a device node is already occupied, registration will fail and 175 - If a device node is already occupied, registration will fail and
176 the webcam is not available. 176 the webcam is not available.
177 - You can have up to 64 video devices; be sure to make enough device 177 - You can have up to 64 video devices; be sure to make enough device
178 nodes in /dev if you want to spread the numbers (this does not apply 178 nodes in /dev if you want to spread the numbers.
179 to devfs). After /dev/video9 comes /dev/video10 (not /dev/videoA). 179 After /dev/video9 comes /dev/video10 (not /dev/videoA).
180 - If a camera does not match any dev_hint, it will simply get assigned 180 - If a camera does not match any dev_hint, it will simply get assigned
181 the first available device node, just as it used to be. 181 the first available device node, just as it used to be.
182 182