summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/plat
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-05-09 14:32:44 -0700
committerTony Lindgren <tony@atomide.com>2012-05-09 14:32:44 -0700
commit65c98038394e65228490ef44353f5d4665690f55 (patch)
treec7bd5afb40d455d995ec65bd9a6fb5d456e0bd45 /arch/arm/plat-omap/include/plat
parentbfd17879866b36e95c58721da070d9f2ac7f8901 (diff)
parentb2f44dc29bfab77b10f3a709f14677f51ce3a4cd (diff)
downloadblackbird-op-linux-65c98038394e65228490ef44353f5d4665690f55.tar.gz
blackbird-op-linux-65c98038394e65228490ef44353f5d4665690f55.zip
Merge branch 'fixes-non-critical' into cleanup-devices
Diffstat (limited to 'arch/arm/plat-omap/include/plat')
-rw-r--r--arch/arm/plat-omap/include/plat/cpu.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index dc6a86bf2172..4bdf14ec6747 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -445,6 +445,7 @@ IS_OMAP_TYPE(3517, 0x3517)
#define OMAP446X_CLASS 0x44600044
#define OMAP4460_REV_ES1_0 (OMAP446X_CLASS | (0x10 << 8))
+#define OMAP4460_REV_ES1_1 (OMAP446X_CLASS | (0x11 << 8))
#define OMAP447X_CLASS 0x44700044
#define OMAP4470_REV_ES1_0 (OMAP447X_CLASS | (0x10 << 8))
OpenPOWER on IntegriCloud