Merge branch 'master' into for-next

[linux-beck.git] / drivers / media / video / zoran / zoran.h

diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index 27f05551183f18ff6bbf739e63a9ff8ec00d1be7..b336259ce20c9cb0ea18a0abd1f4caa584a6a2e9 100644 (file)
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -95,7 +95,7 @@ struct zoran_params {
 
        int quality;            /* Measure for quality of compressed images.
                                 * Scales linearly with the size of the compressed images.
-                                * Must be beetween 0 and 100, 100 is a compression
+                                * Must be between 0 and 100, 100 is a compression
                                 * ratio of 1:4 */
 
        int odd_even;           /* Which field should come first ??? */