Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[linux-2.6.git] / drivers / staging / comedi / drivers / s626.c

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index fdd7ab954d8c0dd9c440b94e8c281e1f95b8c81a..a3cc93362ec245381f8500c4c58000632f4c9777 100644 (file)
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -140,7 +140,7 @@ struct s626_private {
        short allocatedBuf;
        uint8_t ai_cmd_running; /*  ai_cmd is running */
        uint8_t ai_continous;   /*  continous aquisition */
-       int ai_sample_count;    /*  number of samples to aquire */
+       int ai_sample_count;    /*  number of samples to acquire */
        unsigned int ai_sample_timer;
        /*  time between samples in  units of the timer */
        int ai_convert_count;   /*  conversion counter */