Merge branch 'for-2.6.30' into for-2.6.31

diff --cc sound/soc/omap/omap-mcbsp.c
index 2b4a8da,90f4df7..4d6ef0b
--- 1/sound/soc/omap/omap-mcbsp.c
--- 2/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@@ -282,15 -276,14 +282,15 @@@ static int omap_mcbsp_dai_hw_params(str
        }
  
        /* Set FS period and length in terms of bit clock periods */
 -      switch (mcbsp_data->fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
 +      switch (format) {
        case SND_SOC_DAIFMT_I2S:
 -              regs->srgr2     |= FPER(wlen * 2 - 1);
 +              regs->srgr2     |= FPER(wlen * channels - 1);
                regs->srgr1     |= FWID(wlen - 1);
                break;
 +      case SND_SOC_DAIFMT_DSP_A:
        case SND_SOC_DAIFMT_DSP_B:
                regs->srgr2     |= FPER(wlen * channels - 1);
-               regs->srgr1     |= FWID(wlen * channels - 2);
+               regs->srgr1     |= FWID(0);
                break;
        }
  

diff --cc sound/soc/pxa/pxa-ssp.c
Simple merge