diff options
Diffstat (limited to 'v4l_experimental/pvrusb2/pvrusb2-video-v4l.c')
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-video-v4l.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c index 4b21094a0..2e3f84cac 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c +++ b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-video-v4l.c,v 1.8 2006/01/03 05:56:32 mcisely Exp $ + * $Id: pvrusb2-video-v4l.c,v 1.9 2006/01/14 19:09:50 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> @@ -30,14 +30,11 @@ #include "pvrusb2-video-v4l.h" -#ifndef PVR2_SUPPRESS_SAA711X #include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" #include <linux/videodev.h> -#ifndef PVR2_SUPPRESS_V4L2COMMON #include <media/v4l2-common.h> -#endif #include <linux/errno.h> #include <linux/slab.h> @@ -229,7 +226,6 @@ int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *hdw, } -#endif /* PVR2_SUPPRESS_SAA711X */ /* |