rpms/kernel/devel linux-2.6-hdpvr.patch,1.2,1.3

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19658

Modified Files:
	linux-2.6-hdpvr.patch 
Log Message:
update hdpvr patch

linux-2.6-hdpvr.patch:

Index: linux-2.6-hdpvr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-hdpvr.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-hdpvr.patch	8 Dec 2008 18:59:39 -0000	1.2
+++ linux-2.6-hdpvr.patch	15 Jan 2009 07:39:31 -0000	1.3
@@ -1,8 +1,8 @@
 diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index 47102c2..0e279dd 100644
+index 19cf3b8..4f29e1a 100644
 --- a/drivers/media/video/Kconfig
 +++ b/drivers/media/video/Kconfig
-@@ -781,6 +781,8 @@ source "drivers/media/video/gspca/Kconfig"
+@@ -817,6 +817,8 @@ source "drivers/media/video/gspca/Kconfig"
  
  source "drivers/media/video/pvrusb2/Kconfig"
  
@@ -12,10 +12,10 @@
  
  source "drivers/media/video/usbvision/Kconfig"
 diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
-index 16962f3..4331a50 100644
+index 72f6d03..35ff442 100644
 --- a/drivers/media/video/Makefile
 +++ b/drivers/media/video/Makefile
-@@ -115,6 +115,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
+@@ -122,6 +122,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
  obj-$(CONFIG_USB_ZC0301)        += zc0301/
  obj-$(CONFIG_USB_GSPCA)         += gspca/
  
@@ -885,7 +885,7 @@
 +}
 diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
 new file mode 100644
-index 0000000..2378099
+index 0000000..0297f91
 --- /dev/null
 +++ b/drivers/media/video/hdpvr/hdpvr-video.c
 @@ -0,0 +1,1258 @@
@@ -1214,7 +1214,7 @@
 + * video 4 linux 2 file operations
 + */
 +
-+static int hdpvr_open(struct inode *inode, struct file *file)
++static int hdpvr_open(struct file *file)
 +{
 +	struct hdpvr_device *dev;
 +	struct hdpvr_fh *fh;
@@ -1253,7 +1253,7 @@
 +	return retval;
 +}
 +
-+
++#if 0
 +static void hdpvr_draw_down(struct hdpvr_device *dev)
 +{
 +	hdpvr_trace("status = %d", dev->status);
@@ -1279,8 +1279,9 @@
 +
 +	return 0;
 +}
++#endif
 +
-+static int hdpvr_release(struct inode *inode, struct file *file)
++static int hdpvr_release(struct file *file)
 +{
 +	struct hdpvr_fh		*fh  = (struct hdpvr_fh *)file->private_data;
 +	struct hdpvr_device	*dev = fh->dev;
@@ -1455,7 +1456,7 @@
 +}
 +
 +
-+static int hdpvr_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
++static long hdpvr_ioctl(struct file *filp, unsigned int cmd,
 +		unsigned long arg)
 +{
 +	struct hdpvr_fh *fh = (struct hdpvr_fh *)filp->private_data;
@@ -1490,21 +1491,20 @@
 +		break;
 +	}
 +	default:
-+		res = video_ioctl2(inode, filp, cmd, arg);
++		res = video_ioctl2(filp, cmd, arg);
 +	}
 +	mutex_unlock(&dev->io_mutex);
 +	return res;
 +}
 +
-+static const struct file_operations hdpvr_fops = {
++static const struct v4l2_file_operations hdpvr_fops = {
 +	.owner		= THIS_MODULE,
 +	.open		= hdpvr_open,
 +	.release	= hdpvr_release,
-+	.flush		= hdpvr_flush,
++/*	.flush		= hdpvr_flush,	*/
 +	.read		= hdpvr_read,
 +	.poll		= hdpvr_poll,
 +	.ioctl		= hdpvr_ioctl,
-+	.compat_ioctl	= v4l_compat_ioctl32,
 +};
 +
 +/*=======================================================================*/
@@ -2478,18 +2478,10 @@
 +void print_bytes(char *string, unsigned char *buf, size_t len);
 +#endif
 diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
-index 846763d..34eca15 100644
+index b8f2be8..0e8bd98 100644
 --- a/drivers/media/video/v4l2-common.c
 +++ b/drivers/media/video/v4l2-common.c
-@@ -374,6 +374,7 @@ const char *v4l2_ctrl_get_name(u32 id)
- 	case V4L2_CID_CONTRAST: 	return "Contrast";
- 	case V4L2_CID_SATURATION: 	return "Saturation";
- 	case V4L2_CID_HUE: 		return "Hue";
-+	case V4L2_CID_SHARPNESS: 	return "Sharpness";
- 
- 	/* MPEG controls */
- 	case V4L2_CID_MPEG_CLASS: 		return "MPEG Encoder Controls";
-@@ -480,6 +481,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
+@@ -547,6 +547,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
  	case V4L2_CID_CONTRAST:
  	case V4L2_CID_SATURATION:
  	case V4L2_CID_HUE:
@@ -2497,7 +2489,7 @@
  		qctrl->flags |= V4L2_CTRL_FLAG_SLIDER;
  		break;
  	}
-@@ -518,6 +520,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
+@@ -585,6 +586,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
  		return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64);
  	case V4L2_CID_HUE:
  		return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0);