Merge tag 'tag-for-linus-3.5' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf

[karo-tx-linux.git] / drivers / staging / comedi / comedi.h

diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 14ea35ac01564301de1b2df1c3df403ddb37df92..8ea55aef10a7bb15299f477bb6f02ba2f08cb98a 100644 (file)
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -465,7 +465,7 @@
 /* only relevant to kernel modules. */
 
 #define COMEDI_CB_EOS          1       /* end of scan */
-#define COMEDI_CB_EOA          2       /* end of acquisition */
+#define COMEDI_CB_EOA          2       /* end of acquisition/output */
 #define COMEDI_CB_BLOCK                4       /* data has arrived:
                                         * wakes up read() / write() */
 #define COMEDI_CB_EOBUF                8       /* DEPRECATED: end of buffer */