Merge branch 'topic/oss-fix' into for-linus

[mv-sheeva.git] / include / linux / lm_interface.h

diff --git a/include/linux/lm_interface.h b/include/linux/lm_interface.h
index d0a7112b9719ed2b5c25f85b135a7d11caa653e4..2ed8fa1b762ba6e5b36b4cf1118c256ac0c9d318 100644 (file)
--- a/include/linux/lm_interface.h
+++ b/include/linux/lm_interface.h
@@ -122,11 +122,9 @@ typedef void (*lm_callback_t) (void *ptr, unsigned int type, void *data);
  */
 
 #define LM_OUT_ST_MASK         0x00000003
-#define LM_OUT_CACHEABLE       0x00000004
 #define LM_OUT_CANCELED                0x00000008
 #define LM_OUT_ASYNC           0x00000080
 #define LM_OUT_ERROR           0x00000100
-#define LM_OUT_CONV_DEADLK     0x00000200
 
 /*
  * lm_callback_t types