aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIliyan Malchev <malchev@google.com>2011-07-06 16:53:21 -0700
committerPraneeth Bajjuri <praneeth@ti.com>2011-09-20 15:13:27 -0700
commit7089a2878ea211b93c134604ead0267d9b7f3f12 (patch)
treed28bcb3b261282690f79aa92c99920967f59b42a /include
parent980890b407febcf1c988580291ad217bad0ca00b (diff)
downloadlinux-linaro-7089a2878ea211b93c134604ead0267d9b7f3f12.tar.gz
ion: fix ION_HEAP_<xxx>_MASK definitions
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ion.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/ion.h b/include/linux/ion.h
index 42823151cd7..111982f48dc 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;