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 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
mux.c
diff --git
a/arch/arm/plat-omap/mux.c
b/arch/arm/plat-omap/mux.c
index
0670363
..
0d4aa0d
100644
(file)
--- a/
arch/arm/plat-omap/mux.c
+++ b/
arch/arm/plat-omap/mux.c
@@
-54,7
+54,7
@@
int __init_or_module omap_cfg_reg(const unsigned long index)
{
struct pin_config *reg;
- if (
cpu_is_omap34xx() || cpu_is_omap44xx
()) {
+ if (
!cpu_class_is_omap1
()) {
printk(KERN_ERR "mux: Broken omap_cfg_reg(%lu) entry\n",
index);
WARN_ON(1);