diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-12-18 20:41:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-19 14:06:12 -0300 |
| commit | b9d0aa6e211039548f1480a5838398d517f1c3a9 (patch) | |
| tree | 2e1a6bab9e8d9c393c6a2af528bbe0bc0a91e215 /drivers/media/video/Makefile | |
| parent | f769c26085ee0945fba3ba0ea48781770a8c81e2 (diff) | |
| download | blackbird-op-linux-b9d0aa6e211039548f1480a5838398d517f1c3a9.tar.gz blackbird-op-linux-b9d0aa6e211039548f1480a5838398d517f1c3a9.zip | |
[media] v4l: Add custom compat_ioctl32 operation
Drivers implementing custom ioctls need to handle 32-bit/64-bit
compatibility themselves. Provide them with a way to do so.
To avoid circular module dependencies, merge the v4l2-compat-ioctl32
module into videodev. There is no point in keeping them separate, as the
v4l2_compat_ioctl32() function is required by videodev if CONFIG_COMPAT
is set anyway.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/Makefile')
| -rw-r--r-- | drivers/media/video/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 2a572bca3895..d70dd0dc1f90 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -12,14 +12,13 @@ omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \ v4l2-event.o v4l2-ctrls.o v4l2-subdev.o +ifeq ($(CONFIG_COMPAT),y) + videodev-objs += v4l2-compat-ioctl32.o +endif # V4L2 core modules obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o -ifeq ($(CONFIG_COMPAT),y) - obj-$(CONFIG_VIDEO_DEV) += v4l2-compat-ioctl32.o -endif - obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o # All i2c modules must come first: |
