summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Thomas <rmthomas@sciolus.org>2011-01-10 18:34:41 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-21 20:20:56 (GMT)
commit18545cfd3623e5cd8960f5155f95e0a9c790a54c (patch)
tree1ea020ddce6c47cb3e93d36772250a4bd289ab91
parent0a8692b534e18fcec6eac07551bb37a22659f5c7 (diff)
downloadlinux-18545cfd3623e5cd8960f5155f95e0a9c790a54c.tar.xz
Staging: easycap: Make easycap_debug non-static
The parameter easycap_debug appears in macros JOT and JOM and therefore needs to be visible from all source files. The easycap_ prefix should be sufficient to avoid namespace clashes outside the module. Signed-off-by: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/easycap/easycap.h1
-rw-r--r--drivers/staging/easycap/easycap_main.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h
index 8ebf96f..063d447 100644
--- a/drivers/staging/easycap/easycap.h
+++ b/drivers/staging/easycap/easycap.h
@@ -65,7 +65,6 @@
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/slab.h>
-#include <linux/smp_lock.h>
#include <linux/module.h>
#include <linux/kref.h>
#include <linux/usb.h>
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c
index acc1f56..22cf02b 100644
--- a/drivers/staging/easycap/easycap_main.c
+++ b/drivers/staging/easycap/easycap_main.c
@@ -32,7 +32,7 @@
#include "easycap_standard.h"
#include "easycap_ioctl.h"
-static int easycap_debug;
+int easycap_debug;
static int easycap_bars;
int easycap_gain = 16;
module_param_named(debug, easycap_debug, int, S_IRUGO | S_IWUSR);