From 6fa20f82966473fd148a149150753d5a399591bf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Aug 2012 11:49:35 -0700 Subject: [PATCH] Revert "Update ion header" This reverts commit eb75db7d83a6c46578517c90f1165c61bb1fa41b. --- libc/kernel/common/linux/ion.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libc/kernel/common/linux/ion.h b/libc/kernel/common/linux/ion.h index aba44b385..0f872ec0c 100644 --- a/libc/kernel/common/linux/ion.h +++ b/libc/kernel/common/linux/ion.h @@ -27,7 +27,7 @@ enum ion_heap_type { ION_HEAP_TYPE_CARVEOUT, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ION_HEAP_TYPE_CUSTOM, - ION_NUM_HEAPS = 16, + ION_NUM_HEAPS, }; #define ION_HEAP_SYSTEM_MASK (1 << ION_HEAP_TYPE_SYSTEM) /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ @@ -63,9 +63,8 @@ struct ion_custom_data { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ION_IOC_MAP _IOWR(ION_IOC_MAGIC, 2, struct ion_fd_data) #define ION_IOC_SHARE _IOWR(ION_IOC_MAGIC, 4, struct ion_fd_data) -#define ION_IOC_IMPORT _IOWR(ION_IOC_MAGIC, 5, struct ion_fd_data) -#define ION_IOC_SYNC _IOWR(ION_IOC_MAGIC, 7, struct ion_fd_data) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define ION_IOC_IMPORT _IOWR(ION_IOC_MAGIC, 5, int) #define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data) +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif