Merge tag 'locks-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 16cb1c195fd8ef775c328b1273507875a9e6806b..df2c29edbbcd50444b11add3575d30220643c01d 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -693,9 +693,12 @@ void __init dra7xxx_check_revision(void)
                        omap_revision = DRA722_REV_ES1_0;
                        break;
                case 1:
-               default:
                        omap_revision = DRA722_REV_ES2_0;
                        break;
+               case 2:
+               default:
+                       omap_revision = DRA722_REV_ES2_1;
+                       break;
                }
                break;