summaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-10-25 09:56:32 +0200
committerTakashi Iwai <tiwai@suse.de>2010-10-25 09:56:32 +0200
commit79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (patch)
treee32a4c267dc1b5950012e18c1e71d8057140f1f5 /sound/soc/davinci
parentf6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff)
parent97c44b2dbd0060e2e6bd56236eb638ab02ec7f30 (diff)
downloadlinux-79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703.tar.bz2
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/soc/davinci')
-rw-r--r--sound/soc/davinci/davinci-sffsdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c
index 40eccfe9e358..4948a79f86a0 100644
--- a/sound/soc/davinci/davinci-sffsdr.c
+++ b/sound/soc/davinci/davinci-sffsdr.c
@@ -150,7 +150,7 @@ static int __init sffsdr_init(void)
sffsdr_snd_resources,
ARRAY_SIZE(sffsdr_snd_resources));
if (ret) {
- printk(KERN_ERR "platform device add ressources failed\n");
+ printk(KERN_ERR "platform device add resources failed\n");
goto error;
}