diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2011-03-06 00:55:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 13:52:56 -0800 |
| commit | cb81fa07f8beaead14ce500a0e43171591a03ea7 (patch) | |
| tree | b954ceac507c1a87a38af45d9b22f3590666e12b /drivers/staging/easycap/easycap.h | |
| parent | c0b3a8a034c225727a810977aee0ccd72b2d92c9 (diff) | |
staging/easycap: kill EASYCAP_IS_VIDEODEV_CLIENT compilation conditional
remove EASYCAP_IS_VIDEODEV_CLIENT and irrelevant code as the define
is always set in the in-kernel driver
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/easycap.h')
| -rw-r--r-- | drivers/staging/easycap/easycap.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index a80d023a8f0b..1f94e2389efc 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h @@ -29,7 +29,6 @@ * THE FOLLOWING PARAMETERS ARE UNDEFINED: * * EASYCAP_DEBUG - * EASYCAP_IS_VIDEODEV_CLIENT * * IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER * OPTIONS. @@ -81,12 +80,8 @@ #include <sound/initval.h> #include <sound/control.h> #endif /* !CONFIG_EASYCAP_OSS */ -/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ -#ifdef EASYCAP_IS_VIDEODEV_CLIENT #include <media/v4l2-dev.h> #include <media/v4l2-device.h> -#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ -/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ #include <linux/videodev2.h> #include <linux/soundcard.h> @@ -295,12 +290,9 @@ struct easycap { int isdongle; int minor; -/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ -#ifdef EASYCAP_IS_VIDEODEV_CLIENT struct video_device video_device; struct v4l2_device v4l2_device; -#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ -/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ + int status; unsigned int audio_pages_per_fragment; unsigned int audio_bytes_per_fragment; |