summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc/pwc.h
diff options
context:
space:
mode:
authorHartmut Hackmann <hartmut.hackmann@t-online.de>2007-02-17 01:16:41 +0100
committerHartmut Hackmann <hartmut.hackmann@t-online.de>2007-02-17 01:16:41 +0100
commit5a728a822e3d6d1fc62e86410ec71cb87504f08b (patch)
tree63be62ced84f42da611fe8cda64da85e39a76337 /linux/drivers/media/video/pwc/pwc.h
parent4850e008216efdfb888352955d0d166d7363743c (diff)
parent14f8694a006fc440ea2f5f18aaefd3ff7d98e313 (diff)
downloadmediapointer-dvb-s2-5a728a822e3d6d1fc62e86410ec71cb87504f08b.tar.gz
mediapointer-dvb-s2-5a728a822e3d6d1fc62e86410ec71cb87504f08b.tar.bz2
merge with main repository
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc.h')
-rw-r--r--linux/drivers/media/video/pwc/pwc.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h
index 7e9c4237d..e778a2b8c 100644
--- a/linux/drivers/media/video/pwc/pwc.h
+++ b/linux/drivers/media/video/pwc/pwc.h
@@ -39,11 +39,6 @@
#include "pwc-uncompress.h"
#include <media/pwc-ioctl.h>
-/* Turn some debugging options on/off */
-#ifndef CONFIG_PWC_DEBUG
-#define CONFIG_PWC_DEBUG 1
-#endif
-
/* Version block */
#define PWC_MAJOR 10
#define PWC_MINOR 0
@@ -76,7 +71,7 @@
#define PWC_DEBUG_TRACE(fmt, args...) PWC_DEBUG(TRACE, fmt, ##args)
-#if CONFIG_PWC_DEBUG
+#ifdef CONFIG_USB_PWC_DEBUG
#define PWC_DEBUG_LEVEL (PWC_DEBUG_LEVEL_MODULE)
@@ -270,7 +265,7 @@ extern "C" {
#endif
/* Global variables */
-#if CONFIG_PWC_DEBUG
+#ifdef CONFIG_USB_PWC_DEBUG
extern int pwc_trace;
#endif
extern int pwc_mbufs;