Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / video / omap2 / dss / venc.c

diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 26e94d5..8503630 100644 (file)
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -725,6 +725,11 @@ void venc_dump_regs(struct seq_file *s)
 {
 #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r))
 
+       if (cpu_is_omap44xx()) {
+               seq_printf(s, "VENC currently disabled on OMAP44xx\n");
+               return;
+       }
+
        if (venc_runtime_get())
                return;