Merge branch 'for-2.6.34' into for-2.6.35

Conflicts due to context changes next to the backported DMA data change:
	include/sound/soc.h

diff --cc include/sound/soc.h
index 80dfac162723a1c06420dc1d792164019674fb98,a57fbfcd4c8f26877626f34caf122de3216f1da6..4ab3dad4a9c99bcde8fa896d641c9e5d759c4b35
--- 1/include/sound/soc.h
--- 2/include/sound/soc.h
+++ b/include/sound/soc.h
@@@ -381,7 -374,7 +381,7 @@@ struct snd_soc_pcm_stream 
        unsigned int rate_max;          /* max rate */
        unsigned int channels_min;      /* min channels */
        unsigned int channels_max;      /* max channels */
-       unsigned int active;            /* num of active users of the stream */
 -      unsigned int active:1;          /* stream is in use */
++      unsigned int active;            /* stream is in use */
        void *dma_data;                 /* used by platform code */
  };
  

diff --cc sound/soc/codecs/wm8994.c
index fc3dce8149249cbc002f48ca3b4661292d58b56c,f8355ac76a42e736245c52d3a03b2c7c35c5d0c0..e00201e0820e57a64aef687b8312976072b754bb
--- 1/sound/soc/codecs/wm8994.c
--- 2/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -3866,36 -3735,13 +3871,37 @@@ static int wm8994_codec_probe(struct pl
        case 3:
                wm8994->hubs.dcs_codes = -5;
                wm8994->hubs.hp_startup_mode = 1;
+               wm8994->hubs.dcs_readback_mode = 1;
                break;
        default:
+               wm8994->hubs.dcs_readback_mode = 1;
                break;
        }
-                          
  
 +      ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC1_DET,
 +                               wm8994_mic_irq, "Mic 1 detect", wm8994);
 +      if (ret != 0)
 +              dev_warn(&pdev->dev,
 +                       "Failed to request Mic1 detect IRQ: %d\n", ret);
 +
 +      ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT,
 +                               wm8994_mic_irq, "Mic 1 short", wm8994);
 +      if (ret != 0)
 +              dev_warn(&pdev->dev,
 +                       "Failed to request Mic1 short IRQ: %d\n", ret);
 +
 +      ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC2_DET,
 +                               wm8994_mic_irq, "Mic 2 detect", wm8994);
 +      if (ret != 0)
 +              dev_warn(&pdev->dev,
 +                       "Failed to request Mic2 detect IRQ: %d\n", ret);
 +
 +      ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC2_SHRT,
 +                               wm8994_mic_irq, "Mic 2 short", wm8994);
 +      if (ret != 0)
 +              dev_warn(&pdev->dev,
 +                       "Failed to request Mic2 short IRQ: %d\n", ret);
 +
        /* Remember if AIFnLRCLK is configured as a GPIO.  This should be
         * configured on init - if a system wants to do this dynamically
         * at runtime we can deal with that then.