am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."

* commit '97dba6cf074ab8c4d5c67eb8fcea7dc82d434d29':
  emulator gralloc: removed compilation warnings.
This commit is contained in:
David Turner
2011-06-21 23:37:07 -07:00
committed by Android Git Automerger

View File

@@ -712,11 +712,15 @@ struct private_module_t HAL_MODULE_INFO_SYM = {
id: GRALLOC_HARDWARE_MODULE_ID,
name: "Graphics Memory Allocator Module",
author: "The Android Open Source Project",
methods: &gralloc_module_methods
methods: &gralloc_module_methods,
dso: NULL,
reserved: {0, }
},
registerBuffer: gralloc_register_buffer,
unregisterBuffer: gralloc_unregister_buffer,
lock: gralloc_lock,
unlock: gralloc_unlock,
perform: NULL,
reserved_proc : {NULL, }
}
};