Browse Source

V4L/DVB (4494a): Fix compilation when V4L1 support is not present

VIDIOCGMBUF should be compiled only when V4L1 support is selected, since
this ioctl is from the obsoleted API.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab 18 năm trước cách đây
mục cha
commit
c3ab204ccb

+ 2 - 0
drivers/media/common/saa7146_video.c

@@ -1190,6 +1190,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
 		}
 		}
 		return err;
 		return err;
 	}
 	}
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 	case VIDIOCGMBUF:
 	case VIDIOCGMBUF:
 	{
 	{
 		struct video_mbuf *mbuf = arg;
 		struct video_mbuf *mbuf = arg;
@@ -1218,6 +1219,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
 		mutex_unlock(&q->lock);
 		mutex_unlock(&q->lock);
 		return 0;
 		return 0;
 	}
 	}
+#endif
 	default:
 	default:
 		return v4l_compat_translate_ioctl(inode,file,cmd,arg,
 		return v4l_compat_translate_ioctl(inode,file,cmd,arg,
 						  saa7146_video_do_ioctl);
 						  saa7146_video_do_ioctl);