diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-27 14:09:24 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-27 14:09:24 -0200 |
| commit | 07c40dde6fd84df8218fed6351fe81f77458406e (patch) | |
| tree | 2d8046452992b6b68b5c6d067ee6ca4a690b39b7 /linux/drivers/media/video/usbvideo | |
| parent | 0b14b001f4b716b7d53a1413de30bbdb70764651 (diff) | |
| parent | 56ab5d5a038d60cd901d04a60c56f4a9e0631c00 (diff) | |
| download | mediapointer-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')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/ibmcam.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/konicawc.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/quickcam_messenger.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/ultracam.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/usbvideo.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/usbvideo/ibmcam.c b/linux/drivers/media/video/usbvideo/ibmcam.c index cb907a45c..1261593cf 100644 --- a/linux/drivers/media/video/usbvideo/ibmcam.c +++ b/linux/drivers/media/video/usbvideo/ibmcam.c @@ -121,7 +121,7 @@ static int init_model2_yb = -1; /* 01.01.08 - Added for RCA video in support -LO */ /* Settings for camera model 3 */ -static int init_model3_input = 0; +static int init_model3_input; module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level: 0-9 (default=0)"); diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c index 850034753..539fe984a 100644 --- a/linux/drivers/media/video/usbvideo/konicawc.c +++ b/linux/drivers/media/video/usbvideo/konicawc.c @@ -68,7 +68,7 @@ static int debug; } #else #define DEBUG(n, arg...) -static const int debug = 0; +static const int debug; #endif diff --git a/linux/drivers/media/video/usbvideo/quickcam_messenger.c b/linux/drivers/media/video/usbvideo/quickcam_messenger.c index b32c0b9e3..e2af2d132 100644 --- a/linux/drivers/media/video/usbvideo/quickcam_messenger.c +++ b/linux/drivers/media/video/usbvideo/quickcam_messenger.c @@ -55,7 +55,7 @@ static int debug; } #else #define DEBUG(n, arg...) -static const int debug = 0; +static const int debug; #endif #define DRIVER_VERSION "v0.01" 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; diff --git a/linux/drivers/media/video/usbvideo/usbvideo.c b/linux/drivers/media/video/usbvideo/usbvideo.c index 484628734..f685aca2f 100644 --- a/linux/drivers/media/video/usbvideo/usbvideo.c +++ b/linux/drivers/media/video/usbvideo/usbvideo.c @@ -522,7 +522,7 @@ void usbvideo_TestPattern(struct uvd *uvd, int fullframe, int pmode) struct usbvideo_frame *frame; int num_cell = 0; int scan_length = 0; - static int num_pass = 0; + static int num_pass; if (uvd == NULL) { err("%s: uvd == NULL", __FUNCTION__); |