Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux

[mirror_ubuntu-zesty-kernel.git] / include / media / davinci / dm355_ccdc.h

diff --git a/include/media/davinci/dm355_ccdc.h b/include/media/davinci/dm355_ccdc.h
index adf2fe4bf0bb2cd37a61c45791bc10fd919b3bb4..c669a9fb75e57504673b3c4c86d7a37c57555a3a 100644 (file)
--- a/include/media/davinci/dm355_ccdc.h
+++ b/include/media/davinci/dm355_ccdc.h
@@ -38,7 +38,7 @@ enum ccdc_sample_line {
        CCDC_SAMPLE_16LINES
 };
 
-/* enum for Alaw gama width */
+/* enum for Alaw gamma width */
 enum ccdc_gamma_width {
        CCDC_GAMMA_BITS_13_4,
        CCDC_GAMMA_BITS_12_3,
@@ -97,8 +97,8 @@ enum ccdc_mfilt2 {
 struct ccdc_a_law {
        /* Enable/disable A-Law */
        unsigned char enable;
-       /* Gama Width Input */
-       enum ccdc_gamma_width gama_wd;
+       /* Gamma Width Input */
+       enum ccdc_gamma_width gamma_wd;
 };
 
 /* structure for Black Clamping */