Merge branch 'fix/asoc' into for-linus

* fix/asoc:
  ASoC: OMAP: Fix FS polarity in OSK5912 machine driver
  ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver
  ASoC: Fix include build error in s3c2412-i2s.c
  ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
  ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
  ASoC: Fix jive_wm8750.c build problems
  ASoC: pxa-ssp: allow setting of dai format 0

diff --combined sound/soc/pxa/pxa-ssp.c
index 308a657928d234630f321c470ca5611a465c7c46,152118cb5d618236193f99bdd2eb27416797ef56..de2254475d52b78c19b83c4c65dd12f23d673eb2
--- 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>
@@@ -806,6 -806,7 +806,7 @@@ static int pxa_ssp_probe(struct platfor
                goto err_priv;
        }
  
+       priv->dai_fmt = (unsigned int) -1;
        dai->private_data = priv;
  
        return 0;