diff options
| author | Maciej Wereski <m.wereski@partner.samsung.com> | 2017-02-06 02:48:02 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2017-02-06 02:48:02 -0800 |
| commit | 87e0f1a3135effd78283a79f76e717f7b6d5a278 (patch) | |
| tree | fab195c3e31c16bebd62080a09dc9ba5668090de | |
| parent | a6802153aa3aab9af8777461fc9a9cb1165cbfab (diff) | |
| parent | c9ba05c775fdbcde6677022da83f5340e6f6c551 (diff) | |
| download | kernel-common-87e0f1a3135effd78283a79f76e717f7b6d5a278.tar.gz kernel-common-87e0f1a3135effd78283a79f76e717f7b6d5a278.tar.bz2 kernel-common-87e0f1a3135effd78283a79f76e717f7b6d5a278.zip | |
Merge "x86: LLVMLinux: Fix "incomplete type const struct x86cpu_device_id"" into tizen
| -rw-r--r-- | include/linux/mod_devicetable.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 45e921401b06..740c6df3b3a7 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -398,6 +398,7 @@ struct virtio_device_id { /* * For Hyper-V devices we use the device guid as the id. */ +#define vmbus_device_id hv_vmbus_device_id struct hv_vmbus_device_id { __u8 guid[16]; kernel_ulong_t driver_data; /* Data private to the driver */ @@ -548,6 +549,11 @@ struct amba_id { * See documentation of "x86_match_cpu" for details. */ +/* + * MODULE_DEVICE_TABLE expects this struct to be called x86cpu_device_id. + * Although gcc seems to ignore this error, clang fails without this define. + */ +#define x86cpu_device_id x86_cpu_id struct x86_cpu_id { __u16 vendor; __u16 family; @@ -575,6 +581,7 @@ struct ipack_device_id { #define MEI_CL_MODULE_PREFIX "mei:" #define MEI_CL_NAME_SIZE 32 +#define mei_device_id mei_cl_device_id struct mei_cl_device_id { char name[MEI_CL_NAME_SIZE]; kernel_ulong_t driver_info; @@ -594,6 +601,7 @@ struct mei_cl_device_id { * Identifies a RapidIO device based on both the device/vendor IDs and * the assembly device/vendor IDs. */ +#define rapidio_device_id rio_device_id struct rio_device_id { __u16 did, vid; __u16 asm_did, asm_vid; |