diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-14 08:14:50 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-14 08:14:50 -0700 |
| commit | 080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047 (patch) | |
| tree | 2a367e97dcffe9ced54ff71b03ab893a3248fdb4 /include/uapi/linux/firewire-cdev.h | |
| parent | e91f24ae027a583f2faff84456fa2630144bfed8 (diff) | |
| parent | 39c41df9c1950fba0ee6a4e7a63be281e89fe437 (diff) | |
Merge branch 'zynq/dt' into next/dt
* zynq/dt: (1054 commits)
arm: zynq: dt: Set correct L2 ram latencies
+ v3.11-rc5
Conflicts:
arch/arm/Makefile
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): * |