diff options
Diffstat (limited to 'v4l_experimental/pvrusb2/pvrusb2-tuner.c')
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-tuner.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/v4l_experimental/pvrusb2/pvrusb2-tuner.c b/v4l_experimental/pvrusb2/pvrusb2-tuner.c index b02b35954..5223bfcb0 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-tuner.c +++ b/v4l_experimental/pvrusb2/pvrusb2-tuner.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-tuner.c,v 1.10 2006/01/03 06:00:57 mcisely Exp $ + * $Id: pvrusb2-tuner.c,v 1.11 2006/01/14 19:09:50 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> @@ -28,9 +28,7 @@ #include "compat.h" #include <linux/videodev.h> #include <media/tuner.h> -#ifndef PVR2_SUPPRESS_V4L2COMMON #include <media/v4l2-common.h> -#endif struct pvr2_tuner_handler { struct pvr2_hdw *hdw; @@ -43,21 +41,15 @@ struct pvr2_tuner_handler { static void set_type(struct pvr2_tuner_handler *ctxt) { struct pvr2_hdw *hdw = ctxt->hdw; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) struct tuner_setup setup; -#endif pvr2_trace(PVR2_TRACE_CHIPS,"i2c tuner set_type(%d)",hdw->tuner_type); if (((int)(hdw->tuner_type)) < 0) return; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) setup.addr = ADDR_UNSET; setup.type = hdw->tuner_type; setup.mode_mask = T_RADIO | T_ANALOG_TV; /* We may really want mode_mask to be T_ANALOG_TV for now */ pvr2_i2c_client_cmd(ctxt->client,TUNER_SET_TYPE_ADDR,&setup); -#else - pvr2_i2c_client_cmd(ctxt->client,TUNER_SET_TYPE,&hdw->tuner_type); -#endif ctxt->type_update_fl = 0; } |