diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-06-25 17:07:39 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-28 00:53:12 +0400 |
| commit | 880c35c5850464c934f02a5ec7d4c1a4df386fce (patch) | |
| tree | f118915d7b76559fb60ccb3a02f970189d4e9fed /drivers/media/video/pwc | |
| parent | 1990d50b58bef127a647005fdcada6d07081d3ef (diff) | |
| download | linux-880c35c5850464c934f02a5ec7d4c1a4df386fce.tar.xz | |
[media] pwc: Use the default version for VIDIOC_QUERYCAP
After discussing with Hans, change pwc to use the default version
control.
The only version ever used for pwc driver is 10.0.12, due to
commit 2b455db6d456ef2d44808a8377fd3bc832e08317.
Changing it to 3.x.y won't conflict with the old version.
There's no namespace conflicts in any predictable future.
Even on the remote far-away case where we might have a conflict,
it will be on just one specific stable Kernel release (Kernel 10.0.12),
if we ever have such stable release.
So, it is safe and consistent on using 3.x.y numering schema for
it.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc')
| -rw-r--r-- | drivers/media/video/pwc/pwc-v4l.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/pwc/pwc.h | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c index f85c51249c7b..059bd95c1225 100644 --- a/drivers/media/video/pwc/pwc-v4l.c +++ b/drivers/media/video/pwc/pwc-v4l.c @@ -349,7 +349,6 @@ static int pwc_querycap(struct file *file, void *fh, struct v4l2_capability *cap strcpy(cap->driver, PWC_NAME); strlcpy(cap->card, vdev->name, sizeof(cap->card)); usb_make_path(pdev->udev, cap->bus_info, sizeof(cap->bus_info)); - cap->version = PWC_VERSION_CODE; cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index f5445d960510..33863b91461c 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h @@ -44,12 +44,7 @@ #include <media/pwc-ioctl.h> /* Version block */ -#define PWC_MAJOR 10 -#define PWC_MINOR 0 -#define PWC_EXTRAMINOR 15 - -#define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR, PWC_MINOR, PWC_EXTRAMINOR) -#define PWC_VERSION __stringify(PWC_MAJOR) "." __stringify(PWC_MINOR) "." __stringify(PWC_EXTRAMINOR) +#define PWC_VERSION "10.0.15" #define PWC_NAME "pwc" #define PFX PWC_NAME ": " |