diff options
| -rw-r--r-- | linux/include/media/tuner-types.h | 7 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/linux/include/media/tuner-types.h b/linux/include/media/tuner-types.h index e84b23b0d..68408c9fe 100644 --- a/linux/include/media/tuner-types.h +++ b/linux/include/media/tuner-types.h @@ -9,11 +9,14 @@ enum param_type { TUNER_PARAM_TYPE_RADIO, \ TUNER_PARAM_TYPE_PAL, \ TUNER_PARAM_TYPE_SECAM, \ - TUNER_PARAM_TYPE_NTSC, \ + TUNER_PARAM_TYPE_NTSC +#if 0 /* to be added when we merge dvb-pll */ TUNER_PARAM_TYPE_ATSC, \ TUNER_PARAM_TYPE_DVBT, \ TUNER_PARAM_TYPE_DVBS, \ - TUNER_PARAM_TYPE_DVBC + TUNER_PARAM_TYPE_DVBC, \ + TUNER_PARAM_TYPE_DVBS2 +#endif }; struct tuner_range { diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 43b1b8774..c70666049 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2006-01-12 21:56 mkrufky + + * linux/include/media/tuner-types.h: + - add param_type dvbs2 + - disable all dvb param_types, which will not + be needed until we merge dvb-pll. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2006-01-12 20:06 hverkuil * linux/Documentation/video4linux/CARDLIST.tuner: |