diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-04-05 18:03:02 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-04-05 18:03:02 +0200 |
| commit | bcaafb56e4c3741c1923db37683a4590dda2cbfb (patch) | |
| tree | 4ade810f7cbd3425665c1ce57769745871565866 /linux/drivers/media/video/Makefile | |
| parent | ffa071fb6b99731b41db5e814dbb2b0403c7c98c (diff) | |
| parent | 8dd3ceb79cec4a833fbc9fd654b7e71e9548d331 (diff) | |
| download | mediapointer-dvb-s2-bcaafb56e4c3741c1923db37683a4590dda2cbfb.tar.gz mediapointer-dvb-s2-bcaafb56e4c3741c1923db37683a4590dda2cbfb.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/Makefile')
| -rw-r--r-- | linux/drivers/media/video/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index 08765d874..3f1a0350a 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -10,7 +10,7 @@ stkwebcam-objs := stk-webcam.o stk-sensor.o omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o -videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-subdev.o +videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o ifeq ($(CONFIG_COMPAT),y) @@ -134,6 +134,7 @@ obj-$(CONFIG_VIDEO_CX18) += cx18/ obj-$(CONFIG_VIDEO_VIVI) += vivi.o obj-$(CONFIG_VIDEO_CX23885) += cx23885/ +obj-$(CONFIG_VIDEO_MX1) += mx1_camera.o obj-$(CONFIG_VIDEO_MX3) += mx3_camera.o obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o |