diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 10:48:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 10:48:13 -0800 |
| commit | d3569d163cba40f9c5682df083dbed3f049478a4 (patch) | |
| tree | 1a473b4378d3184859424b2bd1389f3d46083fec /sound/core | |
| parent | 20c300b10c358daa507be335aec6aa3987ef425a (diff) | |
| parent | f0e48b6bd4e407459715240cd241ddb6b89bdf81 (diff) | |
| download | linux-d3569d163cba40f9c5682df083dbed3f049478a4.tar.gz linux-d3569d163cba40f9c5682df083dbed3f049478a4.tar.bz2 linux-d3569d163cba40f9c5682df083dbed3f049478a4.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: virtuoso: Xonar DS: fix polarity of front output
ALSA: Au88x0 - Reduce the number of playback subdevices of au8830 from 32 to 16
ALSA: Au88x0 - Support 4 channels playback when AC97 codecs has SDAC bit
ALSA: HDA: Fix internal microphone on Dell Studio 16 XPS 1645
ALSA: Don't prompt for CONFIG_SND_COMPRESS_OFFLOAD
ALSA: HDA: Use LPIB position fix for Macbook Pro 7,1
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/Kconfig | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig index ad409381f8cc..b413ed05e74d 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig @@ -12,6 +12,9 @@ config SND_HWDEP config SND_RAWMIDI tristate +config SND_COMPRESS_OFFLOAD + tristate + # To be effective this also requires INPUT - users should say: # select SND_JACK if INPUT=y || INPUT=SND # to avoid having to force INPUT on. @@ -154,16 +157,6 @@ config SND_DYNAMIC_MINORS If you are unsure about this, say N here. -config SND_COMPRESS_OFFLOAD - tristate "ALSA Compressed audio offload support" - default n - help - If you want support for offloading compressed audio and have such - a hardware, then you should say Y here and also to the DSP driver - of your platform. - - If you are unsure about this, say N here. - config SND_SUPPORT_OLD_API bool "Support old ALSA API" default y |