Merge branch 'master' into for-upstream

[linux-2.6-omap-h63xx.git] / sound / soc / at91 / at91-ssc.c

diff --git a/sound/soc/at91/at91-ssc.c b/sound/soc/at91/at91-ssc.c
index 5d44515e62e0b58e6d316e517d749bfd8cca681e..1b61cc4612618eedc61434fa23f559d54a0e4d3a 100644 (file)
--- a/sound/soc/at91/at91-ssc.c
+++ b/sound/soc/at91/at91-ssc.c
@@ -5,7 +5,7 @@
  *         Endrelia Technologies Inc.
  *
  * Based on pxa2xx Platform drivers by
- * Liam Girdwood <liam.girdwood@wolfsonmicro.com>
+ * Liam Girdwood <lrg@slimlogic.co.uk>
  *
  *  This program is free software; you can redistribute  it and/or modify it
  *  under  the terms of  the GNU General  Public License as published by the
@@ -408,7 +408,7 @@ static int at91_ssc_hw_params(struct snd_pcm_substream *substream,
                dma_params->pdc_xfer_size = 4;
                break;
        default:
-               printk(KERN_WARNING "at91-ssc: unsupported PCM format");
+               printk(KERN_WARNING "at91-ssc: unsupported PCM format\n");
                return -EINVAL;
        }