From 246cbbc1be074d4bcc7b3d30b72dd6c948cc4ce2 Mon Sep 17 00:00:00 2001
From: Bharat Bhushan <r65777@freescale.com>
Date: Tue, 11 Oct 2011 11:26:08 +0530
Subject: [PATCH] --- yaml --- r: 274222 b: refs/heads/master c:
 e33ee8b6f473b33a41c281f5329d9d7b3bed8ff5 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/kernel/idle_e500.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8190ac120d79..fa7045c6dbc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2228511833e267e833514cc85ba9626f9dacd661
+refs/heads/master: e33ee8b6f473b33a41c281f5329d9d7b3bed8ff5
diff --git a/trunk/arch/powerpc/kernel/idle_e500.S b/trunk/arch/powerpc/kernel/idle_e500.S
index 3e2b95c6ae67..4f0ab85f3788 100644
--- a/trunk/arch/powerpc/kernel/idle_e500.S
+++ b/trunk/arch/powerpc/kernel/idle_e500.S
@@ -26,7 +26,7 @@ _GLOBAL(e500_idle)
 	ori	r4,r4,_TLF_NAPPING	/* so when we take an exception */
 	stw	r4,TI_LOCAL_FLAGS(r3)	/* it will return to our caller */
 
-#ifdef CONFIG_E500MC
+#ifdef CONFIG_PPC_E500MC
 	wrteei	1
 1:	wait