diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2007-10-04 00:54:11 -0700 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2007-10-04 00:54:11 -0700 |
| commit | f4510336fb73dfe1e7ef7c77e76be67a092efa20 (patch) | |
| tree | cca2def0e1d9952899ad771743c3919ffb7cd55e /linux/drivers/media/video/saa7134/saa7134.h | |
| parent | de4861886737027203b44c1f5cf8851effa5bea2 (diff) | |
| download | mediapointer-dvb-s2-f4510336fb73dfe1e7ef7c77e76be67a092efa20.tar.gz mediapointer-dvb-s2-f4510336fb73dfe1e7ef7c77e76be67a092efa20.tar.bz2 | |
videobuf: Remove references to old Kconfig option name
From: Trent Piepho <xyzzy@speakeasy.org>
CONFIG_VIDEO_BUF_DVB became CONFIG_VIDEOBUF_DVB.
But in these cases, it makes more sense to use CONFIG_VIDEO_SAA7134_DVB
or CONFIG_VIDEO_CX88_DVB_MODULE depending on the driver.
The reference in cx23885.h should just be removed, as the code there needs to
be included if DVB is on or off. I do not think you can even compile the
cx23885 driver without DVB. It's clearly just leftover from when the file was
obvious copied from the cx88 driver (which is not mentioned in the copyright
BTW).
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134.h')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 1c2f6ba1f..f7c641d63 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -48,7 +48,7 @@ #include <sound/core.h> #include <sound/pcm.h> #endif -#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) +#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) #include <media/videobuf-dvb.h> #endif @@ -559,7 +559,7 @@ struct saa7134_dev { struct work_struct empress_workqueue; int empress_started; -#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) +#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) /* SAA7134_MPEG_DVB only */ struct videobuf_dvb dvb; int (*original_demod_sleep)(struct dvb_frontend* fe); |