aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc/pwc-if.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/pwc/pwc-if.c')
-rw-r--r--drivers/media/video/pwc/pwc-if.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 9825fd348108..27ed76986ca2 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -128,7 +128,7 @@ static int default_size = PSZ_QCIF;
128static int default_fps = 10; 128static int default_fps = 10;
129static int default_fbufs = 3; /* Default number of frame buffers */ 129static int default_fbufs = 3; /* Default number of frame buffers */
130 int pwc_mbufs = 2; /* Default number of mmap() buffers */ 130 int pwc_mbufs = 2; /* Default number of mmap() buffers */
131#if CONFIG_PWC_DEBUG 131#ifdef CONFIG_USB_PWC_DEBUG
132 int pwc_trace = PWC_DEBUG_LEVEL; 132 int pwc_trace = PWC_DEBUG_LEVEL;
133#endif 133#endif
134static int power_save = 0; 134static int power_save = 0;
@@ -1051,7 +1051,7 @@ static void pwc_remove_sysfs_files(struct video_device *vdev)
1051 video_device_remove_file(vdev, &class_device_attr_button); 1051 video_device_remove_file(vdev, &class_device_attr_button);
1052} 1052}
1053 1053
1054#if CONFIG_PWC_DEBUG 1054#ifdef CONFIG_USB_PWC_DEBUG
1055static const char *pwc_sensor_type_to_string(unsigned int sensor_type) 1055static const char *pwc_sensor_type_to_string(unsigned int sensor_type)
1056{ 1056{
1057 switch(sensor_type) { 1057 switch(sensor_type) {
@@ -1835,7 +1835,7 @@ module_param(size, charp, 0444);
1835module_param(fps, int, 0444); 1835module_param(fps, int, 0444);
1836module_param(fbufs, int, 0444); 1836module_param(fbufs, int, 0444);
1837module_param(mbufs, int, 0444); 1837module_param(mbufs, int, 0444);
1838#if CONFIG_PWC_DEBUG 1838#ifdef CONFIG_USB_PWC_DEBUG
1839module_param_named(trace, pwc_trace, int, 0644); 1839module_param_named(trace, pwc_trace, int, 0644);
1840#endif 1840#endif
1841module_param(power_save, int, 0444); 1841module_param(power_save, int, 0444);
@@ -1908,7 +1908,7 @@ static int __init usb_pwc_init(void)
1908 default_fbufs = fbufs; 1908 default_fbufs = fbufs;
1909 PWC_DEBUG_MODULE("Number of frame buffers set to %d.\n", default_fbufs); 1909 PWC_DEBUG_MODULE("Number of frame buffers set to %d.\n", default_fbufs);
1910 } 1910 }
1911#if CONFIG_PWC_DEBUG 1911#ifdef CONFIG_USB_PWC_DEBUG
1912 if (pwc_trace >= 0) { 1912 if (pwc_trace >= 0) {
1913 PWC_DEBUG_MODULE("Trace options: 0x%04x\n", pwc_trace); 1913 PWC_DEBUG_MODULE("Trace options: 0x%04x\n", pwc_trace);
1914 } 1914 }