diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/media/radio/Kconfig | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/radio/Kconfig')
| -rw-r--r-- | drivers/media/radio/Kconfig | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index de3128a31de8..220076b1b956 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig | |||
| @@ -350,5 +350,15 @@ config RADIO_ZOLTRIX_PORT | |||
| 350 | help | 350 | help |
| 351 | Enter the I/O port of your Zoltrix radio card. | 351 | Enter the I/O port of your Zoltrix radio card. |
| 352 | 352 | ||
| 353 | endmenu | 353 | config USB_DSBR |
| 354 | tristate "D-Link USB FM radio support (EXPERIMENTAL)" | ||
| 355 | depends on USB && VIDEO_V4L1 && EXPERIMENTAL | ||
| 356 | ---help--- | ||
| 357 | Say Y here if you want to connect this type of radio to your | ||
| 358 | computer's USB port. Note that the audio is not digital, and | ||
| 359 | you must connect the line out connector to a sound card or a | ||
| 360 | set of speakers. | ||
| 354 | 361 | ||
| 362 | To compile this driver as a module, choose M here: the | ||
| 363 | module will be called dsbr100. | ||
| 364 | endmenu | ||