Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / media / davinci / vpss.h

diff --git a/include/media/davinci/vpss.h b/include/media/davinci/vpss.h
index c59cc029c74ae3ab64b93a0293bbdd03b162ef51..b586495bcd53cfa9d676847415431e1914d6dfbd 100644 (file)
--- a/include/media/davinci/vpss.h
+++ b/include/media/davinci/vpss.h
@@ -44,7 +44,7 @@ struct vpss_pg_frame_size {
        short pplen;
 };
 
-/* Used for enable/diable VPSS Clock */
+/* Used for enable/disable VPSS Clock */
 enum vpss_clock_sel {
        /* DM355/DM365 */
        VPSS_CCDC_CLOCK,