diff options
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/tuner.h | 3 | ||||
| -rw-r--r-- | linux/include/media/video-buf-dvb.h | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 325397891..aa729ed9b 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,5 +1,6 @@ -/* +/* $Id: tuner.h,v 1.27 2005/06/18 04:00:19 mkrufky Exp $ + * tuner.h - definition for different tuners Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de) diff --git a/linux/include/media/video-buf-dvb.h b/linux/include/media/video-buf-dvb.h index 865836f50..848459f79 100644 --- a/linux/include/media/video-buf-dvb.h +++ b/linux/include/media/video-buf-dvb.h @@ -1,5 +1,5 @@ /* - * $Id: video-buf-dvb.h,v 1.6 2005/06/14 22:53:55 hhackmann Exp $ + * $Id: video-buf-dvb.h,v 1.7 2005/06/18 04:00:19 mkrufky Exp $ */ #include <dvbdev.h> @@ -20,7 +20,11 @@ struct videobuf_dvb { int nfeeds; /* videobuf_dvb_(un)register manges this */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)) struct dvb_adapter adapter; +#else + struct dvb_adapter *adapter; +#endif struct dvb_demux demux; struct dmxdev dmxdev; struct dmx_frontend fe_hw; |