From 947d5c411e57b814deab235f6b7fd3e7f6aa15d1 Mon Sep 17 00:00:00 2001
From: Alistair Buxton <a.j.buxton@gmail.com>
Date: Fri, 18 Sep 2009 20:53:04 +0100
Subject: [PATCH] --- yaml --- r: 172703 b: refs/heads/master c:
 1f73b4de93e06d18c28cb282761c8507bc476489 h: refs/heads/master i:   172701:
 20a190c0de08955ebf43217c937ffca5144695a7   172699:
 252c31da46fa988e327b3bee135109b05308b24f   172695:
 189f178df9872b404bbc74dac60f5ae5cea377a9   172687:
 4e5f42fc07cce38e8d840b064c697e74efe9e0bd   172671:
 8066e1f06794e0b622e65c79a033ec9233ecdddb v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/mach-omap1/pm.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 60befbdb4461..0cda686cecb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab985ff471048479b475f973358ccc6af8e42bc4
+refs/heads/master: 1f73b4de93e06d18c28cb282761c8507bc476489
diff --git a/trunk/arch/arm/mach-omap1/pm.h b/trunk/arch/arm/mach-omap1/pm.h
index 0f20aedd63f4..56a647986ae9 100644
--- a/trunk/arch/arm/mach-omap1/pm.h
+++ b/trunk/arch/arm/mach-omap1/pm.h
@@ -105,6 +105,7 @@
 #define OMAP7XX_IDLE_LOOP_REQUEST	0x0C00
 
 #if     !defined(CONFIG_ARCH_OMAP730) && \
+	!defined(CONFIG_ARCH_OMAP850) && \
 	!defined(CONFIG_ARCH_OMAP15XX) && \
 	!defined(CONFIG_ARCH_OMAP16XX)
 #warning "Power management for this processor not implemented yet"