diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 10:51:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 10:51:56 -0400 |
| commit | 05a88a43604abb816dfbff075bb114224641793b (patch) | |
| tree | 7bf95bdd4d4dadbd8500b2761fdd499fc01fc10f /sound/oss/Kconfig | |
| parent | daf799cca8abbf7f3e253ecf1d41d244070773d7 (diff) | |
| parent | 6c35ae3c327ef4b5f51d3428d2ba47ac2153e882 (diff) | |
Merge tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"This contains small fixes since the previous pull request:
- A few regression fixes and small updates of HD-audio
- Yet another fix for Haswell HDMI audio
- A copule of trivial fixes in ASoC McASP, DPAM and WM8994"
* tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
Revert "ALSA: hda - Don't set up active streams twice"
ALSA: Add comment for control TLV API
ALSA: hda - Apply pin-enablement workaround to all Haswell HDMI codecs
ALSA: HDA: Fix Oops caused by dereference NULL pointer
ALSA: mips/sgio2audio: Remove redundant platform_set_drvdata()
ALSA: mips/hal2: Remove redundant platform_set_drvdata()
ALSA: hda - Fix 3.9 regression of EAPD init on Conexant codecs
sound: Fix make allmodconfig on MIPS
ALSA: hda - Fix system panic when DMA > 40 bits for Nvidia audio controllers
ALSA: atmel: Remove redundant platform_set_drvdata()
ASoC: McASP: Fix receive clock polarity in DAIFMT_NB_NF mode.
ASoC: wm8994: missing break in wm8994_aif3_hw_params()
ASoC: McASP: Add pins output direction for rx clocks when configured in CBS_CFS format
ASoC: dapm: use clk_prepare_enable and clk_disable_unprepare
Diffstat (limited to 'sound/oss/Kconfig')
| -rw-r--r-- | sound/oss/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 5849b129e50d..51c4ba95a32d 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig | |||
| @@ -250,6 +250,7 @@ config MSND_FIFOSIZE | |||
| 250 | menuconfig SOUND_OSS | 250 | menuconfig SOUND_OSS |
| 251 | tristate "OSS sound modules" | 251 | tristate "OSS sound modules" |
| 252 | depends on ISA_DMA_API && VIRT_TO_BUS | 252 | depends on ISA_DMA_API && VIRT_TO_BUS |
| 253 | depends on !ISA_DMA_SUPPORT_BROKEN | ||
| 253 | help | 254 | help |
| 254 | OSS is the Open Sound System suite of sound card drivers. They make | 255 | OSS is the Open Sound System suite of sound card drivers. They make |
| 255 | sound programming easier since they provide a common API. Say Y or | 256 | sound programming easier since they provide a common API. Say Y or |