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

diff --combined sound/core/Kconfig
index ad409381f8cca21370f4802b1a5044af2f946b71,349756978ed3d651186b025863b54039321231e6..b413ed05e74deae78fbd97809c99f0fd68f1ee46
--- 1/sound/core/Kconfig
--- 2/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@@ -5,6 -5,7 +5,6 @@@ config SND_TIME
  config SND_PCM
        tristate
        select SND_TIMER
 -      select GCD
  
  config SND_HWDEP
        tristate
@@@ -12,6 -13,9 +12,9 @@@
  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 -158,6 +157,6 @@@ config SND_DYNAMIC_MINOR
  
          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