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 branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[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
4ada6a9
..
565b906
100644
(file)
--- a/
arch/arm/mach-omap2/mcbsp.c
+++ b/
arch/arm/mach-omap2/mcbsp.c
@@
-126,6
+126,8
@@
static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
return -ENOMEM;
}
+ pdata->mcbsp_config_type = oh->class->rev;
+
if (oh->class->rev == MCBSP_CONFIG_TYPE3) {
if (id == 2)
/* The FIFO has 1024 + 256 locations */