git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
mcbsp.c
diff --git
a/arch/arm/mach-omap2/mcbsp.c
b/arch/arm/mach-omap2/mcbsp.c
index
565b906
..
4a6ef6a
100644
(file)
--- a/
arch/arm/mach-omap2/mcbsp.c
+++ b/
arch/arm/mach-omap2/mcbsp.c
@@
-149,7
+149,7
@@
static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
ARRAY_SIZE(omap2_mcbsp_latency), false);
kfree(pdata);
if (IS_ERR(od)) {
ARRAY_SIZE(omap2_mcbsp_latency), false);
kfree(pdata);
if (IS_ERR(od)) {
- pr_err("%s: Cant build omap_device for %s:%s.\n", __func__,
+ pr_err("%s: Can
'
t build omap_device for %s:%s.\n", __func__,
name, oh->name);
return PTR_ERR(od);
}
name, oh->name);
return PTR_ERR(od);
}