Merge branch 'for-2.6.30' into for-2.6.31

diff --combined sound/soc/pxa/pxa-ssp.c
index 176af7ff234b79dec3907ce1267a716b16f0152d,308a657928d234630f321c470ca5611a465c7c46..6768e4ecfd75e4ca8ab61dce66c6f92b6155aeea
--- 1/sound/soc/pxa/pxa-ssp.c
--- 2/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@@ -30,7 -30,7 +30,7 @@@
  #include <sound/pxa2xx-lib.h>
  
  #include <mach/hardware.h>
- #include <mach/pxa-regs.h>
+ #include <mach/dma.h>
  #include <mach/regs-ssp.h>
  #include <mach/audio.h>
  #include <mach/ssp.h>
@@@ -568,10 -568,7 +568,10 @@@ static int pxa_ssp_set_dai_fmt(struct s
                case SND_SOC_DAIFMT_NB_IF:
                        break;
                case SND_SOC_DAIFMT_IB_IF:
 -                      sspsp |= SSPSP_SCMODE(3);
 +                      sspsp |= SSPSP_SCMODE(2);
 +                      break;
 +              case SND_SOC_DAIFMT_IB_NF:
 +                      sspsp |= SSPSP_SCMODE(2) | SSPSP_SFRMP;
                        break;
                default:
                        return -EINVAL;
@@@ -588,13 -585,7 +588,13 @@@
                case SND_SOC_DAIFMT_NB_NF:
                        sspsp |= SSPSP_SFRMP;
                        break;
 +              case SND_SOC_DAIFMT_NB_IF:
 +                      break;
                case SND_SOC_DAIFMT_IB_IF:
 +                      sspsp |= SSPSP_SCMODE(2);
 +                      break;
 +              case SND_SOC_DAIFMT_IB_NF:
 +                      sspsp |= SSPSP_SCMODE(2) | SSPSP_SFRMP;
                        break;
                default:
                        return -EINVAL;