From: Iliyan Malchev <malchev@google.com>
Date: Wed, 6 Jul 2011 23:53:21 +0000 (-0700)
Subject: ion: fix ION_HEAP_<xxx>_MASK definitions
X-Git-Tag: 2.1b_release~2530
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6962926b47cba2d49936aa11924e59226fb9d070;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

ion: fix ION_HEAP_<xxx>_MASK definitions

Signed-off-by: Iliyan Malchev <malchev@google.com>
---

diff --git a/include/linux/ion.h b/include/linux/ion.h
index 4282315..111982f 100644
--- a/include/linux/ion.h
+++ b/include/linux/ion.h
@@ -22,12 +22,12 @@
 struct ion_handle;
 /**
  * enum ion_heap_types - list of all possible types of heaps
- * @ION_HEAP_SYSTEM:		memory allocated via vmalloc
- * @ION_HEAP_SYSTEM_CONTIG:	memory allocated via kmalloc
- * @ION_HEAP_CARVEOUT:		memory allocated from a prereserved
- * 				carveout heap, allocations are physically
- * 				contiguous
- * @ION_HEAP_END:		helper for iterating over heaps
+ * @ION_HEAP_TYPE_SYSTEM:	 memory allocated via vmalloc
+ * @ION_HEAP_TYPE_SYSTEM_CONTIG: memory allocated via kmalloc
+ * @ION_HEAP_TYPE_CARVEOUT:	 memory allocated from a prereserved
+ * 				 carveout heap, allocations are physically
+ * 				 contiguous
+ * @ION_HEAP_END:		 helper for iterating over heaps
  */
 enum ion_heap_type {
 	ION_HEAP_TYPE_SYSTEM,
@@ -38,9 +38,9 @@ enum ion_heap_type {
 	ION_NUM_HEAPS,
 };
 
-#define ION_HEAP_SYSTEM_MASK		(1 << ION_HEAP_SYSTEM)
-#define ION_HEAP_SYSTEM_CONTIG_MASK	(1 << ION_HEAP_SYSTEM_CONTIG)
-#define ION_HEAP_CARVEOUT_MASK		(1 << ION_HEAP_CARVEOUT)
+#define ION_HEAP_SYSTEM_MASK		(1 << ION_HEAP_TYPE_SYSTEM)
+#define ION_HEAP_SYSTEM_CONTIG_MASK	(1 << ION_HEAP_TYPE_SYSTEM_CONTIG)
+#define ION_HEAP_CARVEOUT_MASK		(1 << ION_HEAP_TYPE_CARVEOUT)
 
 #ifdef __KERNEL__
 struct ion_device;