Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[sfrench/cifs-2.6.git] / drivers / media / video / bt8xx / bttvp.h

diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index d2956010f763c0cb05a58fb21c6fc629086f86dc..311c4c541e01d554f3b396248bdf18419ce99afa 100644 (file)
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -360,7 +360,7 @@ struct bttv {
        int mbox_csel;
 
        /* risc memory management data
-          - must aquire s_lock before changing these
+          - must acquire s_lock before changing these
           - only the irq handler is supported to touch top + bottom + vcurr */
        struct btcx_riscmem     main;
        struct bttv_buffer      *screen;    /* overlay             */