summaryrefslogtreecommitdiff
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 11:09:13 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 11:09:13 +1100
commit3a999f2a6f5f2e255b650af0c4af4af023602532 (patch)
tree7cb35a92a3f17c8d72ae5ba5dd4d54898c1934d3 /include/uapi/linux
parent213200950da09a394cddcaef5d3e13f3a4b07394 (diff)
parent1dbbd1fbc9b03509de316ecd5b8a6c87319f1986 (diff)
Merge remote-tracking branch 'hid/for-next'
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/uhid.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/uhid.h b/include/uapi/linux/uhid.h
index 9c6974f16966..e9ed951e2b09 100644
--- a/include/uapi/linux/uhid.h
+++ b/include/uapi/linux/uhid.h
@@ -86,7 +86,7 @@ struct uhid_feature_answer_req {
__u16 err;
__u16 size;
__u8 data[UHID_DATA_MAX];
-};
+} __attribute__((__packed__));
struct uhid_event {
__u32 type;