Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / include / media / drv-intf / saa7146.h

diff --git a/include/media/drv-intf/saa7146.h b/include/media/drv-intf/saa7146.h
index a7bf2c4a2e4d9f360786774f5552108673be06d9..71ce63c99cb435056a5e0611d3b20cee2002865b 100644 (file)
--- a/include/media/drv-intf/saa7146.h
+++ b/include/media/drv-intf/saa7146.h
@@ -139,7 +139,7 @@ struct saa7146_dev
        void                            *ext_priv;      /* pointer for extension private use (most likely some private data) */
        struct saa7146_ext_vv           *ext_vv_data;
 
-       /* per device video/vbi informations (if available) */
+       /* per device video/vbi information (if available) */
        struct saa7146_vv       *vv_data;
        void (*vv_callback)(struct saa7146_dev *dev, unsigned long status);