diff options
| author | Chris Zankel <chris@zankel.net> | 2013-09-05 17:12:08 -0700 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2013-09-05 17:12:08 -0700 |
| commit | 0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd (patch) | |
| tree | fc0354e4da0ff5ab8b8eb65d60d9a8359d02634d /include/uapi/linux/firewire-cdev.h | |
| parent | 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b (diff) | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
Merge tag 'v3.11' into for_next
Update Xtensa tree to Linux 3.11 (merging)
Diffstat (limited to 'include/uapi/linux/firewire-cdev.h')
| -rw-r--r-- | include/uapi/linux/firewire-cdev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/firewire-cdev.h b/include/uapi/linux/firewire-cdev.h index d50036953497..1db453e4b550 100644 --- a/include/uapi/linux/firewire-cdev.h +++ b/include/uapi/linux/firewire-cdev.h @@ -215,8 +215,8 @@ struct fw_cdev_event_request2 { * with the %FW_CDEV_ISO_INTERRUPT bit set, when explicitly requested with * %FW_CDEV_IOC_FLUSH_ISO, or when there have been so many completed packets * without the interrupt bit set that the kernel's internal buffer for @header - * is about to overflow. (In the last case, kernels with ABI version < 5 drop - * header data up to the next interrupt packet.) + * is about to overflow. (In the last case, ABI versions < 5 drop header data + * up to the next interrupt packet.) * * Isochronous transmit events (context type %FW_CDEV_ISO_CONTEXT_TRANSMIT): * |