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/cx88/cx88.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/cx88/cx88.h')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 5bb190eb2..ddd2c2fe9 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -31,7 +31,7 @@ #include <media/video-buf.h> #include <media/cx2341x.h> #include <media/audiochip.h> -#ifdef HAVE_VIDEO_BUF_DVB +#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) #include <media/video-buf-dvb.h> #endif #include "compat.h" @@ -321,7 +321,7 @@ struct cx88_core { unsigned int tuner_formats; /* config info -- dvb */ -#ifdef HAVE_VIDEO_BUF_DVB +#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) struct dvb_pll_desc *pll_desc; unsigned int pll_addr; int (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage); @@ -497,7 +497,7 @@ struct cx8802_dev { int width; int height; -#ifdef HAVE_VIDEO_BUF_DVB +#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) /* for dvb only */ struct videobuf_dvb dvb; void* fe_handle; |