diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-11 14:05:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-11 14:05:34 -0400 |
| commit | 39f86a608a3e0f0164bd1540acf87696cfdfb5bb (patch) | |
| tree | a8a88fd3dda891fd89aa9058ec798aa12d04bc16 /sound/pci | |
| parent | 1b6150fe82de8a555b0200d20bb5e3752fbe4160 (diff) | |
| parent | ed0ee0ce0a3224dab5caa088a5f8b6df25924276 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- dvb core: there is a regression found when used with xine. For
whatever unknown reason, xine (and xine-lib clients) wants that the
frontend to tell what frequency he is using even before the PLL lock
(or at least, it expects a non-zero frequency).
On DVB, the frequency is only actually known after a frequency
zig-zag seek, done by the DVB core. Anyway, the fix was trivial.
That solves Fedora BZ#808871.
- ivtv: fix a regression when selecting the language channel
- uvc: fix a race-related crash
- it913x: fixes firmware loading
- two trivial patches (a dependency issue at a radio driver at sound
Kconfig, and a warning fix on dvb).
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] uvcvideo: Fix race-related crash in uvc_video_clock_update()
[media] Drivers/media/radio: Fix build error
[media] dvb_frontend: fix compiler warning
[media] it913x: fix firmware loading errors
[media] ivtv: Fix AUDIO_(BILINGUAL_)CHANNEL_SELECT regression
[media] dvb_frontend: regression fix: userspace ABI broken for xine
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 88168044375f..5ca0939e4223 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | config SND_TEA575X | 3 | config SND_TEA575X |
| 4 | tristate | 4 | tristate |
| 5 | depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 | 5 | depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO |
| 6 | default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 | 6 | default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO |
| 7 | 7 | ||
| 8 | menuconfig SND_PCI | 8 | menuconfig SND_PCI |
| 9 | bool "PCI sound devices" | 9 | bool "PCI sound devices" |