Merge branch 'for-2.6.33' into for-2.6.34

diff --cc sound/soc/codecs/wm8993.c
Simple merge

diff --cc sound/soc/sh/fsi.c
index 123cd6f45e0c093ca60a30df2beffbff5830539a,42813b80838988c96b62cf5a91f06d870dbc2f6e..5f9f2693f4ebff34d4183cc4d723608f75e59952
--- 1/sound/soc/sh/fsi.c
--- 2/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@ -896,14 -874,9 +896,14 @@@ static int fsi_probe(struct platform_de
        unsigned int irq;
        int ret;
  
 +      if (0 != pdev->id) {
 +              dev_err(&pdev->dev, "current fsi support id 0 only now\n");
 +              return -ENODEV;
 +      }
 +
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        irq = platform_get_irq(pdev, 0);
-       if (!res || !irq) {
+       if (!res || (int)irq <= 0) {
                dev_err(&pdev->dev, "Not enough FSI platform resources.\n");
                ret = -ENODEV;
                goto exit;

diff --cc sound/soc/soc-core.c
Simple merge