Merge ../torvalds-2.6/

[pandora-kernel.git] / drivers / media / video / bttv-risc.c

diff --git a/drivers/media/video/bttv-risc.c b/drivers/media/video/bttv-risc.c
index bdc5ce6..a5ed99b 100644 (file)
--- a/drivers/media/video/bttv-risc.c
+++ b/drivers/media/video/bttv-risc.c
@@ -1,5 +1,4 @@
 /*
-    $Id: bttv-risc.c,v 1.10 2004/11/19 18:07:12 kraxel Exp $
 
     bttv-risc.c  --  interfaces to other kernel modules
 
@@ -334,10 +333,6 @@ bttv_calc_geo(struct bttv *btv, struct bttv_geometry *geo,
        }
 
        vdelay = tvnorm->vdelay;
-#if 0 /* FIXME */
-       if (vdelay < btv->vbi.lines*2)
-               vdelay = btv->vbi.lines*2;
-#endif
 
         xsf = (width*scaledtwidth)/swidth;
         geo->hscale =  ((totalwidth*4096UL)/xsf-4096);
@@ -776,13 +771,8 @@ bttv_overlay_risc(struct bttv *btv,
                bttv_risc_overlay(btv, &buf->bottom, fmt, ov, 0, 0);
                break;
        case V4L2_FIELD_INTERLACED:
-#if 0
-               bttv_risc_overlay(btv, &buf->top,    fmt, ov, 1, 0);
-               bttv_risc_overlay(btv, &buf->bottom, fmt, ov, 0, 1);
-#else
                bttv_risc_overlay(btv, &buf->top,    fmt, ov, 0, 1);
                bttv_risc_overlay(btv, &buf->bottom, fmt, ov, 1, 0);
-#endif
                break;
        default:
                BUG();