aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIliyan Malchev <malchev@google.com>2011-12-02 14:00:52 +0800
committerJohn Stultz <john.stultz@linaro.org>2012-02-14 14:29:12 -0800
commit82542b72c3b8b163985f50cdab36994c53c9cfa1 (patch)
treef271fad02dac79a0a5b6204f74f78ce2949623c2 /include
parent8c8c65f4d0089de5ba66a114f31d5edfba14003f (diff)
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;