Merge remote-tracking branch 'scott/next' into next

[mirror_ubuntu-artful-kernel.git] / drivers / staging / crystalhd / crystalhd_fw_if.h

diff --git a/drivers/staging/crystalhd/crystalhd_fw_if.h b/drivers/staging/crystalhd/crystalhd_fw_if.h
index 4b363a5069d76fa208428bc0ca059aff1397d2df..05615e2a231aad037e8da971c6166d7c5600d688 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_fw_if.h
+++ b/drivers/staging/crystalhd/crystalhd_fw_if.h
@@ -115,7 +115,7 @@ struct fgt_sei {
        unsigned char model_id; /* Model id. */
 
        /* +unused SE based on Thomson spec */
-       unsigned char color_desc_flag;  /* Separate color descrition flag. */
+       unsigned char color_desc_flag;  /* Separate color description flag. */
        unsigned char bit_depth_luma;   /* Bit depth luma minus 8. */
        unsigned char bit_depth_chroma; /* Bit depth chroma minus 8. */
        unsigned char full_range_flag;  /* Full range flag. */