diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2007-01-30 18:26:01 -0800 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2007-01-30 18:26:01 -0800 |
| commit | ad0ae8dc8ffa884e357e5bf55c4808e24848559e (patch) | |
| tree | ee35387c7554ac87f65f63f56eb53c3fccebf11f /linux/drivers/media/video/pwc/pwc.h | |
| parent | ea1ca65b374ae5ed835fe871a3693885ba574ad1 (diff) | |
| download | mediapointer-dvb-s2-ad0ae8dc8ffa884e357e5bf55c4808e24848559e.tar.gz mediapointer-dvb-s2-ad0ae8dc8ffa884e357e5bf55c4808e24848559e.tar.bz2 | |
Remove obsolete alias defines of CONFIG_* settings
From: Trent Piepho <xyzzy@speakeasy.org>
The out of tree v4l-dvb build system didn't always override the kernel's
configuration settings with v4l-dvb's settings correctly. To work around
this, makefiles would define some new macro based on the setting of a
config variable. e.g. the pwc Makefile would define CONFIG_PWC_DEBUG if
CONFIG_USB_PWC_DEBUG (which is defined via Kconfig) was set.
The v4l-dvb build system should now always override correctly, and this
is no longer necessary. This patch gets ride of these extra defines and
just uses the CONFIG_* settings directly.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc.h')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc.h | 9 |
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; |