diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 21:39:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 21:39:35 +0200 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /sound/soc/at91/at91-ssc.c | |
| parent | leo: disable cursor when leaving graphics mode (diff) | |
| parent | Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of ... (diff) | |
| download | linux-56c5d900dbb8e042bfad035d18433476931d8f93.tar.xz linux-56c5d900dbb8e042bfad035d18433476931d8f93.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'sound/soc/at91/at91-ssc.c')
| -rw-r--r-- | sound/soc/at91/at91-ssc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/at91/at91-ssc.c b/sound/soc/at91/at91-ssc.c index 5d44515e62e0..a5b1a79ebffb 100644 --- a/sound/soc/at91/at91-ssc.c +++ b/sound/soc/at91/at91-ssc.c @@ -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; } |