diff options
Diffstat (limited to 'drivers/media/video/hdpvr')
-rw-r--r-- | drivers/media/video/hdpvr/hdpvr-core.c | 1 | ||||
-rw-r--r-- | drivers/media/video/hdpvr/hdpvr-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/hdpvr/hdpvr.h | 6 |
3 files changed, 1 insertions, 8 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c index a27d93b503a5..5442a1732260 100644 --- a/drivers/media/video/hdpvr/hdpvr-core.c +++ b/drivers/media/video/hdpvr/hdpvr-core.c | |||
@@ -474,5 +474,6 @@ module_init(hdpvr_init); | |||
474 | module_exit(hdpvr_exit); | 474 | module_exit(hdpvr_exit); |
475 | 475 | ||
476 | MODULE_LICENSE("GPL"); | 476 | MODULE_LICENSE("GPL"); |
477 | MODULE_VERSION("0.2.1"); | ||
477 | MODULE_AUTHOR("Janne Grunau"); | 478 | MODULE_AUTHOR("Janne Grunau"); |
478 | MODULE_DESCRIPTION("Hauppauge HD PVR driver"); | 479 | MODULE_DESCRIPTION("Hauppauge HD PVR driver"); |
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c index 514aea76eaa5..087f7c08cb85 100644 --- a/drivers/media/video/hdpvr/hdpvr-video.c +++ b/drivers/media/video/hdpvr/hdpvr-video.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/uaccess.h> | 17 | #include <linux/uaccess.h> |
18 | #include <linux/usb.h> | 18 | #include <linux/usb.h> |
19 | #include <linux/mutex.h> | 19 | #include <linux/mutex.h> |
20 | #include <linux/version.h> | ||
21 | #include <linux/workqueue.h> | 20 | #include <linux/workqueue.h> |
22 | 21 | ||
23 | #include <linux/videodev2.h> | 22 | #include <linux/videodev2.h> |
@@ -574,7 +573,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
574 | strcpy(cap->driver, "hdpvr"); | 573 | strcpy(cap->driver, "hdpvr"); |
575 | strcpy(cap->card, "Hauppauge HD PVR"); | 574 | strcpy(cap->card, "Hauppauge HD PVR"); |
576 | usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); | 575 | usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); |
577 | cap->version = HDPVR_VERSION; | ||
578 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | | 576 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | |
579 | V4L2_CAP_AUDIO | | 577 | V4L2_CAP_AUDIO | |
580 | V4L2_CAP_READWRITE; | 578 | V4L2_CAP_READWRITE; |
diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h index 072f23c570f3..d6439db1d18b 100644 --- a/drivers/media/video/hdpvr/hdpvr.h +++ b/drivers/media/video/hdpvr/hdpvr.h | |||
@@ -18,12 +18,6 @@ | |||
18 | #include <media/v4l2-device.h> | 18 | #include <media/v4l2-device.h> |
19 | #include <media/ir-kbd-i2c.h> | 19 | #include <media/ir-kbd-i2c.h> |
20 | 20 | ||
21 | #define HDPVR_MAJOR_VERSION 0 | ||
22 | #define HDPVR_MINOR_VERSION 2 | ||
23 | #define HDPVR_RELEASE 0 | ||
24 | #define HDPVR_VERSION \ | ||
25 | KERNEL_VERSION(HDPVR_MAJOR_VERSION, HDPVR_MINOR_VERSION, HDPVR_RELEASE) | ||
26 | |||
27 | #define HDPVR_MAX 8 | 21 | #define HDPVR_MAX 8 |
28 | #define HDPVR_I2C_MAX_SIZE 128 | 22 | #define HDPVR_I2C_MAX_SIZE 128 |
29 | 23 | ||