summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/usbvideo/ultracam.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-01-27 14:09:24 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-27 14:09:24 -0200
commit07c40dde6fd84df8218fed6351fe81f77458406e (patch)
tree2d8046452992b6b68b5c6d067ee6ca4a690b39b7 /linux/drivers/media/video/usbvideo/ultracam.c
parent0b14b001f4b716b7d53a1413de30bbdb70764651 (diff)
parent56ab5d5a038d60cd901d04a60c56f4a9e0631c00 (diff)
downloadmediapointer-dvb-s2-07c40dde6fd84df8218fed6351fe81f77458406e.tar.gz
mediapointer-dvb-s2-07c40dde6fd84df8218fed6351fe81f77458406e.tar.bz2
merge: http://linuxtv.org/hg/~dougsland/v4l
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvideo/ultracam.c')
-rw-r--r--linux/drivers/media/video/usbvideo/ultracam.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/usbvideo/ultracam.c b/linux/drivers/media/video/usbvideo/ultracam.c
index 9128efa71..bd89e6862 100644
--- a/linux/drivers/media/video/usbvideo/ultracam.c
+++ b/linux/drivers/media/video/usbvideo/ultracam.c
@@ -28,9 +28,9 @@ typedef struct {
static struct usbvideo *cams = NULL;
-static int debug = 0;
+static int debug;
-static int flags = 0; /* FLAGS_DISPLAY_HINTS | FLAGS_OVERLAY_STATS; */
+static int flags; /* FLAGS_DISPLAY_HINTS | FLAGS_OVERLAY_STATS; */
static const int min_canvasWidth = 8;
static const int min_canvasHeight = 4;