From 87d872c7a60e9ac627cabac1102b309e49140ec2 Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jlu@pengutronix.de>
Date: Tue, 7 Aug 2012 18:29:45 +0200
Subject: [PATCH] --- yaml --- r: 322299 b: refs/heads/master c:
 6c691b5df1fcd93f2e9f65e1a8a3dd0e6fd158ea h: refs/heads/master i:   322297:
 133ccbcb63e1f6e4fab222e9707cb27687852ff3   322295:
 6cb4d48edc3732ccf7ff17e85be273af8eb4c8d0 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/plat-omap/include/plat/multi.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5a7a0d954635..82fe698c755d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54f32a35f4d3a653a18a2c8c239f19ae060bd803
+refs/heads/master: 6c691b5df1fcd93f2e9f65e1a8a3dd0e6fd158ea
diff --git a/trunk/arch/arm/plat-omap/include/plat/multi.h b/trunk/arch/arm/plat-omap/include/plat/multi.h
index 045e320f1067..324d31b14852 100644
--- a/trunk/arch/arm/plat-omap/include/plat/multi.h
+++ b/trunk/arch/arm/plat-omap/include/plat/multi.h
@@ -108,4 +108,13 @@
 # endif
 #endif
 
+#ifdef CONFIG_SOC_AM33XX
+# ifdef OMAP_NAME
+#  undef  MULTI_OMAP2
+#  define MULTI_OMAP2
+# else
+#  define OMAP_NAME am33xx
+# endif
+#endif
+
 #endif	/* __PLAT_OMAP_MULTI_H */