Merge branch 'for-2.6.29' into for-2.6.30

diff --combined sound/soc/omap/omap-pcm.c
index 607a38c,dd3bb29..8e1431c
--- 1/sound/soc/omap/omap-pcm.c
--- 2/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@@ -175,9 -175,10 +175,10 @@@ static int omap_pcm_trigger(struct snd_
  {
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct omap_runtime_data *prtd = runtime->private_data;
+       unsigned long flags;
        int ret = 0;
  
-       spin_lock_irq(&prtd->lock);
+       spin_lock_irqsave(&prtd->lock, flags);
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
        case SNDRV_PCM_TRIGGER_RESUME:
@@@ -195,7 -196,7 +196,7 @@@
        default:
                ret = -EINVAL;
        }
-       spin_unlock_irq(&prtd->lock);
+       spin_unlock_irqrestore(&prtd->lock, flags);
  
        return ret;
  }
@@@ -264,7 -265,7 +265,7 @@@ static int omap_pcm_mmap(struct snd_pcm
                                     runtime->dma_bytes);
  }
  
 -struct snd_pcm_ops omap_pcm_ops = {
 +static struct snd_pcm_ops omap_pcm_ops = {
        .open           = omap_pcm_open,
        .close          = omap_pcm_close,
        .ioctl          = snd_pcm_lib_ioctl,