diff --git a/[refs] b/[refs] index 6b0e124e4285..0005a99e3a80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86d61b33e48f1da5a6b310d3de93187db62ab72a +refs/heads/master: a88f6667078412e5eff37ead68a043ee0ec9f1da diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h index 2b9f2ac7ed60..78784982b33e 100644 --- a/trunk/include/linux/dmaengine.h +++ b/trunk/include/linux/dmaengine.h @@ -74,7 +74,7 @@ enum dma_transaction_type { * control completion, and communicate status. * @DMA_PREP_INTERRUPT - trigger an interrupt (callback) upon completion of * this transaction - * @DMA_CTRL_ACK - the descriptor cannot be reused until the client + * @DMA_CTRL_ACK - if clear, the descriptor cannot be reused until the client * acknowledges receipt, i.e. has has a chance to establish any dependency * chains * @DMA_COMPL_SKIP_SRC_UNMAP - set to disable dma-unmapping the source buffer(s)