diff options
author | Mike Isely <devnull@localhost> | 2006-01-14 19:09:50 +0000 |
---|---|---|
committer | Mike Isely <devnull@localhost> | 2006-01-14 19:09:50 +0000 |
commit | 4216cf3bb3ba15fd9c18be2d62e65f78c2d95c16 (patch) | |
tree | 55974e24c0d8610eca17526c28b1d8f3cf3a4116 /v4l_experimental/pvrusb2/pvrusb2-video-v4l.c | |
parent | 413f7a2fdb6d39c92212d60002ca4a2258c38ae7 (diff) | |
download | mediapointer-dvb-s2-4216cf3bb3ba15fd9c18be2d62e65f78c2d95c16.tar.gz mediapointer-dvb-s2-4216cf3bb3ba15fd9c18be2d62e65f78c2d95c16.tar.bz2 |
Remove pvrusb2 code which doesn't belong in V4L
-Clean up code & comditional compilation stuff which doesn't belong
in V4L tree or otherwise might cause compilation problems in certain
kernel environments.
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
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 */ /* |