diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /include/linux/videodev2.h | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'include/linux/videodev2.h')
| -rw-r--r-- | include/linux/videodev2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index a62673dad76e..b7146956a929 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -716,7 +716,7 @@ struct v4l2_ext_control | |||
| 716 | __s64 value64; | 716 | __s64 value64; |
| 717 | void *reserved; | 717 | void *reserved; |
| 718 | }; | 718 | }; |
| 719 | }; | 719 | } __attribute__ ((packed)); |
| 720 | 720 | ||
| 721 | struct v4l2_ext_controls | 721 | struct v4l2_ext_controls |
| 722 | { | 722 | { |