diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 14:25:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 14:25:58 -0400 |
| commit | a267c0a887064720dfab5775a4f09b20b4f8ec37 (patch) | |
| tree | 25de1f109ff6ef7f0967c22755604cc667944afd /drivers/media/radio/Kconfig | |
| parent | d756d10e246a01515d07f8161181b8a14afba7cc (diff) | |
| parent | 97989ada7628da262eafb4bebce0a319c7cb0f5f (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (126 commits)
V4L/DVB (5847): Clean up schedule_timeout calls in cpia2 and ivtv code
V4L/DVB (5846): Clean up setting state and scheduling timeouts
V4L/DVB (5844): ivtv: add high volume debugging flag
V4L/DVB (5843): ivtv: fix missing signal_pending check.
V4L/DVB (5842): ivtv: Add locking to ensure stream setup is atomic.
V4L/DVB (5841): tveeprom: add support for Philips FQ1216LME MK3 tuner.
V4L/DVB (5840): fix dst and cx24123: tune() callback changed signess for delay
V4L/DVB (5838): dvb-core: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22)
V4L/DVB (5837): stv0299: Fix signedness warning (gcc 4.1.1, kernel 2.6.22)
V4L/DVB (5836): dvb-ttpci: re-initialize aspect ratio and pan scan after arm crash
V4L/DVB (5835): saa7146/dvb-ttpci: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22)
V4L/DVB (5834): dvb-core: fix signedness warnings and const stripping
V4L/DVB (5832): ir-common: optimize bit extract function
V4L/DVB (5831): stradis: use ARRAY_SIZE
V4L/DVB (5829): Firmware extract and loading for opera dvb-usb update
V4L/DVB (5828): Kconfig: Added GemTek USB radio and removed experimental dependency.
V4L/DVB (5826): Usbvision: video mux cleanup
V4L/DVB (5825): Alter the tuner type for the WinTV USB UK PAL model.
V4L/DVB (5824): Usbvision: Hauppauge WinTV USB SECAM_L fix
V4L/DVB (5821): Saa7134: add remote control support for LifeView FlyDVB-S LR300
...
Diffstat (limited to 'drivers/media/radio/Kconfig')
| -rw-r--r-- | drivers/media/radio/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index 194b102140ef..f8bf9fe37d36 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig | |||
| @@ -324,8 +324,8 @@ config RADIO_ZOLTRIX_PORT | |||
| 324 | Enter the I/O port of your Zoltrix radio card. | 324 | Enter the I/O port of your Zoltrix radio card. |
| 325 | 325 | ||
| 326 | config USB_DSBR | 326 | config USB_DSBR |
| 327 | tristate "D-Link USB FM radio support (EXPERIMENTAL)" | 327 | tristate "D-Link/GemTek USB FM radio support" |
| 328 | depends on USB && VIDEO_V4L2 && EXPERIMENTAL | 328 | depends on USB && VIDEO_V4L2 |
| 329 | ---help--- | 329 | ---help--- |
| 330 | Say Y here if you want to connect this type of radio to your | 330 | Say Y here if you want to connect this type of radio to your |
| 331 | computer's USB port. Note that the audio is not digital, and | 331 | computer's USB port. Note that the audio is not digital, and |