diff options
author | Nick Kralevich <nnk@google.com> | 2013-11-06 19:38:18 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-06 19:38:18 -0800 |
commit | b9154e33f8891b7e7df1b9cda596d6fad1387f2d (patch) | |
tree | 968bc96593217c67fc6b9ebad42058a024484edb | |
parent | 050f86272f90f6d5a5a829f3b523133a99635c63 (diff) | |
parent | eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4 (diff) | |
download | android_hardware_qcom_keymaster-b9154e33f8891b7e7df1b9cda596d6fad1387f2d.tar.gz android_hardware_qcom_keymaster-b9154e33f8891b7e7df1b9cda596d6fad1387f2d.tar.bz2 android_hardware_qcom_keymaster-b9154e33f8891b7e7df1b9cda596d6fad1387f2d.zip |
am eab8a2ac: am f740c98b: Merge "do not use GNU old-style field designators"
* commit 'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4':
do not use GNU old-style field designators
-rw-r--r-- | keymaster_qcom.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp index 629ba82..2284290 100644 --- a/keymaster_qcom.cpp +++ b/keymaster_qcom.cpp @@ -783,20 +783,20 @@ static int qcom_km_open(const hw_module_t* module, const char* name, } static struct hw_module_methods_t keystore_module_methods = { - open: qcom_km_open, + .open = qcom_km_open, }; struct keystore_module HAL_MODULE_INFO_SYM __attribute__ ((visibility ("default"))) = { - common: { - tag: HARDWARE_MODULE_TAG, - version_major: 1, - version_minor: 0, - id: KEYSTORE_HARDWARE_MODULE_ID, - name: "Keymaster QCOM HAL", - author: "The Android Open Source Project", - methods: &keystore_module_methods, - dso: 0, - reserved: {}, + .common = { + .tag = HARDWARE_MODULE_TAG, + .version_major = 1, + .version_minor = 0, + .id = KEYSTORE_HARDWARE_MODULE_ID, + .name = "Keymaster QCOM HAL", + .author = "The Android Open Source Project", + .methods = &keystore_module_methods, + .dso = 0, + .reserved = {}, }, }; |