diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-08-14 11:22:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-14 11:22:09 +0100 |
| commit | 3c729b4344456ebd520636563c854090e3dec611 (patch) | |
| tree | 6caae9f4d4c9f9ae2e033d64486649c6f603a209 /include/uapi/linux/firewire-cdev.h | |
| parent | spi: s3c64xx: Use dmaengine_prep_slave_single() to prepare DMA transfers (diff) | |
| parent | Linux 3.11-rc5 (diff) | |
Merge tag 'v3.11-rc5' into spi-s3c64xx
Linux 3.11-rc5
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): * |