projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[linux-2.6-block.git]
/
sound
/
soc
/
omap
/
overo.c
diff --git
a/sound/soc/omap/overo.c
b/sound/soc/omap/overo.c
index 624f40ecc4720a8d76ef0b157ff3d0b2486be7f3..c25f5276ad6f0135d1699548da4d3d6ad11b56f5 100644
(file)
--- a/
sound/soc/omap/overo.c
+++ b/
sound/soc/omap/overo.c
@@
-107,8
+107,8
@@
static int __init overo_soc_init(void)
{
int ret;
- if (!
machine_is_overo(
)) {
- pr_debug("
Not Overo
!\n");
+ if (!
(machine_is_overo() || machine_is_cm_t35()
)) {
+ pr_debug("
Incomatible machine
!\n");
return -ENODEV;
}
printk(KERN_INFO "overo SoC init\n");