aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88.h
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-10-04 03:54:11 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 23:03:08 -0400
commit5a3ebe8755e88cd765f75121665c0d38004f8f37 (patch)
tree7222fa5758af23b322f9d792632c1a304a3c4bc3 /drivers/media/video/cx88/cx88.h
parent9320874a3e6aea7044a4a7eedeab13db990424ab (diff)
V4L/DVB (6283): videobuf: Remove references to old Kconfig option name
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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88.h')
-rw-r--r--drivers/media/video/cx88/cx88.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index b3fe2d59cd1..42e0a9b8c55 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -31,7 +31,7 @@
31#include <media/videobuf-dma-sg.h> 31#include <media/videobuf-dma-sg.h>
32#include <media/cx2341x.h> 32#include <media/cx2341x.h>
33#include <media/audiochip.h> 33#include <media/audiochip.h>
34#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) 34#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
35#include <media/videobuf-dvb.h> 35#include <media/videobuf-dvb.h>
36#endif 36#endif
37 37
@@ -311,7 +311,7 @@ struct cx88_core {
311 unsigned int tuner_formats; 311 unsigned int tuner_formats;
312 312
313 /* config info -- dvb */ 313 /* config info -- dvb */
314#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) 314#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
315 int (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage); 315 int (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
316#endif 316#endif
317 317
@@ -458,7 +458,7 @@ struct cx8802_dev {
458 int width; 458 int width;
459 int height; 459 int height;
460 460
461#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) 461#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
462 /* for dvb only */ 462 /* for dvb only */
463 struct videobuf_dvb dvb; 463 struct videobuf_dvb dvb;
464 464