Olof,
* Tony Lindgren <[email protected]> [120308 09:34]:
>
> Vaibhav Hiremath (1):
> ARM: OMAP: id: Add missing break statement in omap3xxx_check_revision
FYI, this one will cause a minor merge conflict with what's in
arm-soc/for-next, here's how to resolve for reference:
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@@ -397,7 -342,8 +397,8 @@@ void __init omap3xxx_check_revision(voi
break;
case 0xb944:
omap_revision = AM335X_REV_ES1_0;
- *cpu_rev = "1.0";
+ cpu_rev = "1.0";
+ break;
case 0xb8f2:
switch (rev) {
case 0:
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
