diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-19 07:34:14 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-19 07:34:14 -1000 |
| commit | 9a10758c4475ea9576a62828b6097dcf79f6d3e2 (patch) | |
| tree | 15cba175627ab9c349956d69d4bd5be9f6e7efc4 /sound/mips/Kconfig | |
| parent | e640a280ccb9c448a3d9d522ea730ce00efa8cf0 (diff) | |
| parent | 145c0e914d2cd0cf829b8c4cbe24736b3ee81a91 (diff) | |
Merge tag 'sound-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Nothing looks scary, just a few usual HD-audio regression fixes and
fixup, in addition to a minor Kconfig dependency fix for the old MIPS
drivers"
* tag 'sound-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Fix unused label skip_i915
ALSA: hda - Fix noisy outputs on Dell XPS13 (2015 model)
ALSA: mips: let SND_SGI_O2 select SND_PCM
ALSA: hda - Fix audio crackles on Dell Latitude E7x40
ALSA: hda - adding a DAC/pin preference map for a HP Envy TS machine
Diffstat (limited to 'sound/mips/Kconfig')
| -rw-r--r-- | sound/mips/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/mips/Kconfig b/sound/mips/Kconfig index d2f615ab177a..2153d31fb663 100644 --- a/sound/mips/Kconfig +++ b/sound/mips/Kconfig @@ -12,12 +12,14 @@ if SND_MIPS config SND_SGI_O2 tristate "SGI O2 Audio" depends on SGI_IP32 + select SND_PCM help Sound support for the SGI O2 Workstation. config SND_SGI_HAL2 tristate "SGI HAL2 Audio" depends on SGI_HAS_HAL2 + select SND_PCM help Sound support for the SGI Indy and Indigo2 Workstation. |