summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-video.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-07-07 13:58:38 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-07-07 13:58:38 +0000
commitf8f68583aabe1033ab048108d55d6b51db70ec55 (patch)
tree949262ed76a884711e07ab0222a45a56f01ec0cd /linux/drivers/media/video/cx88/cx88-video.c
parent26f1f9728e5e3fdea7f573b5b159089b3fea1a6d (diff)
downloadmediapointer-dvb-s2-f8f68583aabe1033ab048108d55d6b51db70ec55.tar.gz
mediapointer-dvb-s2-f8f68583aabe1033ab048108d55d6b51db70ec55.tar.bz2
scripts/buildpatch:
- Added code to eliminate #if 0 and #if 1 when submiting pathes to new kernel. Miscelaneous CodingStyle stuff. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
-rw-r--r--linux/drivers/media/video/cx88/cx88-video.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index fc6432e99..d6f6dd24b 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-video.c,v 1.77 2005/07/05 17:37:35 nsh Exp $
+ * $Id: cx88-video.c,v 1.78 2005/07/07 13:58:38 mchehab Exp $
*
* device driver for Conexant 2388x based TV cards
* video4linux video interface
@@ -888,13 +888,13 @@ static int setup_window(struct cx8800_dev *dev, struct cx8800_fh *fh,
fh->clips = clips;
fh->nclips = n;
fh->win = *win;
-#if 0
+/* #if 0 */
fh->ov.setup_ok = 1;
-#endif
+/* #endif */
/* update overlay if needed */
retval = 0;
-#if 0
+/* #if 0 */
if (check_btres(fh, RESOURCE_OVERLAY)) {
struct bttv_buffer *new;
@@ -902,7 +902,7 @@ static int setup_window(struct cx8800_dev *dev, struct cx8800_fh *fh,
bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
retval = bttv_switch_overlay(btv,fh,new);
}
-#endif
+/* #endif */
up(&fh->vidq.lock);
return retval;
}