diff options
| author | The Android Automerger <android-build@android.com> | 2012-08-27 12:46:37 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-08-27 12:46:37 -0700 |
| commit | 19c0b800a323f2149f39f7891c2e53c969584245 (patch) | |
| tree | 3e6cc9f467b8d3026ac4fc34b9f6b6c7f8588806 | |
| parent | eeddc30e7e8f40d40969b2aca6c53fa9cc374498 (diff) | |
| download | bionic-19c0b800a323f2149f39f7891c2e53c969584245.zip bionic-19c0b800a323f2149f39f7891c2e53c969584245.tar.gz bionic-19c0b800a323f2149f39f7891c2e53c969584245.tar.bz2 | |
:Revert "Update ion header"
This reverts commit eb75db7d83a6c46578517c90f1165c61bb1fa41b.
| -rw-r--r-- | libc/kernel/common/linux/ion.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libc/kernel/common/linux/ion.h b/libc/kernel/common/linux/ion.h index aba44b3..0f872ec 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 |