From 3b875eaabf0ea3d78f668cedf3d5d8f2063d16a2 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti.com>
Date: Wed, 14 Nov 2012 16:54:27 -0800
Subject: [PATCH] --- yaml --- r: 339589 b: refs/heads/master c:
 936407358759adb302df93ab61fa68141897270c h: refs/heads/master i:   339587:
 9a0ac7c1c0a826a53cb20028d4adc74aedcef0bf v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-omap2/omap-smp.c | 2 ++
 trunk/arch/arm/mach-omap2/pm44xx.c   | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 74b33e49fc53..5dcb0f4ba5cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1d2037a6c3c754ef7f527249ab2e1dee51e73dd
+refs/heads/master: 936407358759adb302df93ab61fa68141897270c
diff --git a/trunk/arch/arm/mach-omap2/omap-smp.c b/trunk/arch/arm/mach-omap2/omap-smp.c
index 49a08dfe8d88..cd42d921940d 100644
--- a/trunk/arch/arm/mach-omap2/omap-smp.c
+++ b/trunk/arch/arm/mach-omap2/omap-smp.c
@@ -40,6 +40,8 @@
 
 #define OMAP5_CORE_COUNT	0x2
 
+u16 pm44xx_errata;
+
 /* SCU base address */
 static void __iomem *scu_base;
 
diff --git a/trunk/arch/arm/mach-omap2/pm44xx.c b/trunk/arch/arm/mach-omap2/pm44xx.c
index 0adbd7d81ce8..04922d149068 100644
--- a/trunk/arch/arm/mach-omap2/pm44xx.c
+++ b/trunk/arch/arm/mach-omap2/pm44xx.c
@@ -34,7 +34,6 @@ struct power_state {
 };
 
 static LIST_HEAD(pwrst_list);
-u16 pm44xx_errata;
 
 #ifdef CONFIG_SUSPEND
 static int omap4_pm_suspend(void)