diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-30 03:53:02 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-06 05:57:15 -0400 |
commit | 335b3f88f2c3cb101059970f57860503b20d210f (patch) | |
tree | 8f2d71384a4422c25e46c5401aaaaf5d2e15ffc7 /drivers/media/video/gspca/gspca.c | |
parent | 8f47a3cefbb275893ce26ade7094599e4b129bb3 (diff) |
V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option.
This option is changed to GSPCA_DEBUG and it is set by default in gspca.h.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/gspca/gspca.c')
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 3a051c925ff6..7f773e378979 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -47,7 +47,7 @@ MODULE_LICENSE("GPL"); | |||
47 | 47 | ||
48 | static int video_nr = -1; | 48 | static int video_nr = -1; |
49 | 49 | ||
50 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 50 | #ifdef GSPCA_DEBUG |
51 | int gspca_debug = D_ERR | D_PROBE; | 51 | int gspca_debug = D_ERR | D_PROBE; |
52 | EXPORT_SYMBOL(gspca_debug); | 52 | EXPORT_SYMBOL(gspca_debug); |
53 | 53 | ||
@@ -677,7 +677,7 @@ static int try_fmt_vid_cap(struct gspca_dev *gspca_dev, | |||
677 | w = fmt->fmt.pix.width; | 677 | w = fmt->fmt.pix.width; |
678 | h = fmt->fmt.pix.height; | 678 | h = fmt->fmt.pix.height; |
679 | 679 | ||
680 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 680 | #ifdef GSPCA_DEBUG |
681 | if (gspca_debug & D_CONF) | 681 | if (gspca_debug & D_CONF) |
682 | PDEBUG_MODE("try fmt cap", fmt->fmt.pix.pixelformat, w, h); | 682 | PDEBUG_MODE("try fmt cap", fmt->fmt.pix.pixelformat, w, h); |
683 | #endif | 683 | #endif |
@@ -785,7 +785,7 @@ static int dev_open(struct inode *inode, struct file *file) | |||
785 | } | 785 | } |
786 | gspca_dev->users++; | 786 | gspca_dev->users++; |
787 | file->private_data = gspca_dev; | 787 | file->private_data = gspca_dev; |
788 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 788 | #ifdef GSPCA_DEBUG |
789 | /* activate the v4l2 debug */ | 789 | /* activate the v4l2 debug */ |
790 | if (gspca_debug & D_V4L2) | 790 | if (gspca_debug & D_V4L2) |
791 | gspca_dev->vdev.debug |= 3; | 791 | gspca_dev->vdev.debug |= 3; |
@@ -1080,7 +1080,7 @@ static int vidioc_streamon(struct file *file, void *priv, | |||
1080 | if (ret < 0) | 1080 | if (ret < 0) |
1081 | goto out; | 1081 | goto out; |
1082 | } | 1082 | } |
1083 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 1083 | #ifdef GSPCA_DEBUG |
1084 | if (gspca_debug & D_STREAM) { | 1084 | if (gspca_debug & D_STREAM) { |
1085 | PDEBUG_MODE("stream on OK", | 1085 | PDEBUG_MODE("stream on OK", |
1086 | gspca_dev->pixfmt, | 1086 | gspca_dev->pixfmt, |
@@ -1913,7 +1913,7 @@ static void __exit gspca_exit(void) | |||
1913 | module_init(gspca_init); | 1913 | module_init(gspca_init); |
1914 | module_exit(gspca_exit); | 1914 | module_exit(gspca_exit); |
1915 | 1915 | ||
1916 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 1916 | #ifdef GSPCA_DEBUG |
1917 | module_param_named(debug, gspca_debug, int, 0644); | 1917 | module_param_named(debug, gspca_debug, int, 0644); |
1918 | MODULE_PARM_DESC(debug, | 1918 | MODULE_PARM_DESC(debug, |
1919 | "Debug (bit) 0x01:error 0x02:probe 0x04:config" | 1919 | "Debug (bit) 0x01:error 0x02:probe 0x04:config" |