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"