projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes-rc2' into omap-for-v4.6/fixes
[deliverable/linux.git]
/
arch
/
arm
/
mach-omap2
/
id.c
diff --git
a/arch/arm/mach-omap2/id.c
b/arch/arm/mach-omap2/id.c
index d85c24918c177d176fd191aa1ebcfaff5ce90f74..b2f56684c337bddc44e080370ed1ffcdc19d0a46 100644
(file)
--- a/
arch/arm/mach-omap2/id.c
+++ b/
arch/arm/mach-omap2/id.c
@@
-46,6
+46,7
@@
u32 omap_features;
unsigned int omap_rev(void)
{
unsigned int omap_rev(void)
{
+ WARN_ON_ONCE(!omap_revision || omap_revision == -1);
return omap_revision;
}
EXPORT_SYMBOL(omap_rev);
return omap_revision;
}
EXPORT_SYMBOL(omap_rev);
@@
-669,9
+670,9
@@
void __init dra7xxx_check_revision(void)
case 0:
omap_revision = DRA722_REV_ES1_0;
break;
case 0:
omap_revision = DRA722_REV_ES1_0;
break;
+ case 1:
default:
default:
- /* If we have no new revisions */
- omap_revision = DRA722_REV_ES1_0;
+ omap_revision = DRA722_REV_ES2_0;
break;
}
break;
break;
}
break;
This page took
0.024535 seconds
and
5
git commands to generate.