diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 07:28:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 07:28:57 -0700 |
| commit | a9e4820c4c170b3df0d2185f7b4130b0b2daed2c (patch) | |
| tree | 962bc52ba0e8e585d88e1fb9a9be9a67072767dd /include/linux/usb_cdc.h | |
| parent | c0698f2f6e4839ce9463ce731c892993215ea067 (diff) | |
| parent | e838a0d4d5260bce452c96914a6e86b217c53c55 (diff) | |
Merge with Greg's USB tree at kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
Yah, it does work to merge. Knock wood.
Diffstat (limited to 'include/linux/usb_cdc.h')
| -rw-r--r-- | include/linux/usb_cdc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb_cdc.h b/include/linux/usb_cdc.h index 1b68c122279..f22d6beecc7 100644 --- a/include/linux/usb_cdc.h +++ b/include/linux/usb_cdc.h @@ -114,7 +114,7 @@ struct usb_cdc_mdlm_detail_desc { /* type is associated with mdlm_desc.bGUID */ __u8 bGuidDescriptorType; - __u8 bDetailData[]; + __u8 bDetailData[0]; } __attribute__ ((packed)); /*-------------------------------------------------------------------------*/ |