---

yaml --- r: 65668 b: refs/heads/master c: d715e76 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · bd1fe0b · bd1fe0b
1 parent 7b0993b
commit bd1fe0b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be383bd312c4defab8bd4bde8c06fea5bfe0996b
+refs/heads/master: d715e766ddf4786a06abe6a841e956ad8a875963
diff --git a/trunk/drivers/media/video/ivtv/ivtv-fb.c b/trunk/drivers/media/video/ivtv/ivtv-fb.c
@@ -424,10 +424,10 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar
 			finish_wait(&itv->vsync_waitq, &wait);
 			return rc;
 
-		case IVTVFB_IOCTL_PREP_FRAME: {
-			struct ivtvfb_ioctl_dma_host_to_ivtv_args args;
+		case IVTVFB_IOC_DMA_FRAME: {
+			struct ivtvfb_dma_frame args;
 
-			IVTV_FB_DEBUG_INFO("IVTVFB_IOCTL_PREP_FRAME\n");
+			IVTV_FB_DEBUG_INFO("IVTVFB_IOC_DMA_FRAME\n");
 			if (copy_from_user(&args, (void __user *)arg, sizeof(args)))
 				return -EFAULT;
 

diff --git a/trunk/include/media/ivtv-fb.h b/trunk/include/media/ivtv-fb.h
@@ -23,13 +23,12 @@
 
 /* Framebuffer external API */
 
-struct ivtvfb_ioctl_dma_host_to_ivtv_args {
+struct ivtvfb_dma_frame {
 	void __user *source;
 	unsigned long dest_offset;
 	int count;
 };
 
-/* Framebuffer ioctls should use the range 1 - 28 */
-#define IVTVFB_IOCTL_PREP_FRAME         _IOW('@', 3, struct ivtvfb_ioctl_dma_host_to_ivtv_args)
+#define IVTVFB_IOC_DMA_FRAME  _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
 
 #endif