diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/Makefile | 70 | ||||
-rw-r--r-- | drivers/media/video/saa7134/Makefile | 3 |
2 files changed, 38 insertions, 35 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index f7d9a4c6f450..7fb3add1b387 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -12,6 +12,8 @@ omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o | |||
12 | 12 | ||
13 | videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o | 13 | videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o |
14 | 14 | ||
15 | # V4L2 core modules | ||
16 | |||
15 | obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o | 17 | obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o |
16 | ifeq ($(CONFIG_COMPAT),y) | 18 | ifeq ($(CONFIG_COMPAT),y) |
17 | obj-$(CONFIG_VIDEO_DEV) += v4l2-compat-ioctl32.o | 19 | obj-$(CONFIG_VIDEO_DEV) += v4l2-compat-ioctl32.o |
@@ -23,21 +25,15 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y) | |||
23 | obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o | 25 | obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o |
24 | endif | 26 | endif |
25 | 27 | ||
26 | obj-$(CONFIG_VIDEO_TUNER) += tuner.o | 28 | # All i2c modules must come first: |
27 | 29 | ||
28 | obj-$(CONFIG_VIDEO_BT848) += bt8xx/ | 30 | obj-$(CONFIG_VIDEO_TUNER) += tuner.o |
29 | obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o | ||
30 | obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o | 31 | obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o |
31 | obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o | 32 | obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o |
32 | obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o | 33 | obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o |
33 | |||
34 | obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o | 34 | obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o |
35 | obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o | 35 | obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o |
36 | obj-$(CONFIG_VIDEO_SAA5249) += saa5249.o | 36 | obj-$(CONFIG_VIDEO_SAA5249) += saa5249.o |
37 | obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o | ||
38 | obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o | ||
39 | obj-$(CONFIG_VIDEO_W9966) += w9966.o | ||
40 | |||
41 | obj-$(CONFIG_VIDEO_TDA9840) += tda9840.o | 37 | obj-$(CONFIG_VIDEO_TDA9840) += tda9840.o |
42 | obj-$(CONFIG_VIDEO_TEA6415C) += tea6415c.o | 38 | obj-$(CONFIG_VIDEO_TEA6415C) += tea6415c.o |
43 | obj-$(CONFIG_VIDEO_TEA6420) += tea6420.o | 39 | obj-$(CONFIG_VIDEO_TEA6420) += tea6420.o |
@@ -56,11 +52,40 @@ obj-$(CONFIG_VIDEO_BT856) += bt856.o | |||
56 | obj-$(CONFIG_VIDEO_BT866) += bt866.o | 52 | obj-$(CONFIG_VIDEO_BT866) += bt866.o |
57 | obj-$(CONFIG_VIDEO_KS0127) += ks0127.o | 53 | obj-$(CONFIG_VIDEO_KS0127) += ks0127.o |
58 | obj-$(CONFIG_VIDEO_THS7303) += ths7303.o | 54 | obj-$(CONFIG_VIDEO_THS7303) += ths7303.o |
55 | obj-$(CONFIG_VIDEO_VINO) += indycam.o | ||
56 | obj-$(CONFIG_VIDEO_TVP5150) += tvp5150.o | ||
57 | obj-$(CONFIG_VIDEO_TVP514X) += tvp514x.o | ||
58 | obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o | ||
59 | obj-$(CONFIG_VIDEO_CS5345) += cs5345.o | ||
60 | obj-$(CONFIG_VIDEO_CS53L32A) += cs53l32a.o | ||
61 | obj-$(CONFIG_VIDEO_M52790) += m52790.o | ||
62 | obj-$(CONFIG_VIDEO_TLV320AIC23B) += tlv320aic23b.o | ||
63 | obj-$(CONFIG_VIDEO_WM8775) += wm8775.o | ||
64 | obj-$(CONFIG_VIDEO_WM8739) += wm8739.o | ||
65 | obj-$(CONFIG_VIDEO_VP27SMPX) += vp27smpx.o | ||
66 | obj-$(CONFIG_VIDEO_CX25840) += cx25840/ | ||
67 | obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o | ||
68 | obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o | ||
69 | obj-$(CONFIG_VIDEO_OV7670) += ov7670.o | ||
70 | obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o | ||
71 | obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o | ||
59 | 72 | ||
60 | obj-$(CONFIG_VIDEO_ZORAN) += zoran/ | 73 | obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o |
74 | obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o | ||
75 | obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o | ||
76 | obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o | ||
77 | obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o | ||
78 | obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o | ||
79 | |||
80 | # And now the v4l2 drivers: | ||
61 | 81 | ||
82 | obj-$(CONFIG_VIDEO_BT848) += bt8xx/ | ||
83 | obj-$(CONFIG_VIDEO_ZORAN) += zoran/ | ||
84 | obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o | ||
85 | obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o | ||
86 | obj-$(CONFIG_VIDEO_W9966) += w9966.o | ||
62 | obj-$(CONFIG_VIDEO_PMS) += pms.o | 87 | obj-$(CONFIG_VIDEO_PMS) += pms.o |
63 | obj-$(CONFIG_VIDEO_VINO) += vino.o indycam.o | 88 | obj-$(CONFIG_VIDEO_VINO) += vino.o |
64 | obj-$(CONFIG_VIDEO_STRADIS) += stradis.o | 89 | obj-$(CONFIG_VIDEO_STRADIS) += stradis.o |
65 | obj-$(CONFIG_VIDEO_CPIA) += cpia.o | 90 | obj-$(CONFIG_VIDEO_CPIA) += cpia.o |
66 | obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o | 91 | obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o |
@@ -71,17 +96,7 @@ obj-$(CONFIG_VIDEO_CX88) += cx88/ | |||
71 | obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ | 96 | obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ |
72 | obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/ | 97 | obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/ |
73 | obj-$(CONFIG_VIDEO_USBVISION) += usbvision/ | 98 | obj-$(CONFIG_VIDEO_USBVISION) += usbvision/ |
74 | obj-$(CONFIG_VIDEO_TVP5150) += tvp5150.o | ||
75 | obj-$(CONFIG_VIDEO_TVP514X) += tvp514x.o | ||
76 | obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/ | 99 | obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/ |
77 | obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o | ||
78 | obj-$(CONFIG_VIDEO_CS5345) += cs5345.o | ||
79 | obj-$(CONFIG_VIDEO_CS53L32A) += cs53l32a.o | ||
80 | obj-$(CONFIG_VIDEO_M52790) += m52790.o | ||
81 | obj-$(CONFIG_VIDEO_TLV320AIC23B) += tlv320aic23b.o | ||
82 | obj-$(CONFIG_VIDEO_WM8775) += wm8775.o | ||
83 | obj-$(CONFIG_VIDEO_WM8739) += wm8739.o | ||
84 | obj-$(CONFIG_VIDEO_VP27SMPX) += vp27smpx.o | ||
85 | obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ | 100 | obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ |
86 | obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ | 101 | obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ |
87 | obj-$(CONFIG_VIDEO_MXB) += mxb.o | 102 | obj-$(CONFIG_VIDEO_MXB) += mxb.o |
@@ -94,19 +109,12 @@ obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o | |||
94 | obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o | 109 | obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o |
95 | obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o | 110 | obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o |
96 | obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o | 111 | obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o |
97 | obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o | ||
98 | 112 | ||
99 | obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o | 113 | obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o |
100 | 114 | ||
101 | obj-$(CONFIG_VIDEO_CX25840) += cx25840/ | ||
102 | obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o | ||
103 | obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o | ||
104 | obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o | 115 | obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o |
105 | 116 | ||
106 | obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o | 117 | obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o |
107 | obj-$(CONFIG_VIDEO_OV7670) += ov7670.o | ||
108 | |||
109 | obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o | ||
110 | 118 | ||
111 | obj-$(CONFIG_USB_DABUSB) += dabusb.o | 119 | obj-$(CONFIG_USB_DABUSB) += dabusb.o |
112 | obj-$(CONFIG_USB_OV511) += ov511.o | 120 | obj-$(CONFIG_USB_OV511) += ov511.o |
@@ -138,13 +146,7 @@ obj-$(CONFIG_VIDEO_CX23885) += cx23885/ | |||
138 | 146 | ||
139 | obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o | 147 | obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o |
140 | obj-$(CONFIG_SOC_CAMERA) += soc_camera.o | 148 | obj-$(CONFIG_SOC_CAMERA) += soc_camera.o |
141 | obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o | ||
142 | obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o | ||
143 | obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o | ||
144 | obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o | ||
145 | obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o | ||
146 | obj-$(CONFIG_SOC_CAMERA_PLATFORM) += soc_camera_platform.o | 149 | obj-$(CONFIG_SOC_CAMERA_PLATFORM) += soc_camera_platform.o |
147 | obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o | ||
148 | # soc-camera host drivers have to be linked after camera drivers | 150 | # soc-camera host drivers have to be linked after camera drivers |
149 | obj-$(CONFIG_VIDEO_MX1) += mx1_camera.o | 151 | obj-$(CONFIG_VIDEO_MX1) += mx1_camera.o |
150 | obj-$(CONFIG_VIDEO_MX3) += mx3_camera.o | 152 | obj-$(CONFIG_VIDEO_MX3) += mx3_camera.o |
@@ -155,6 +157,8 @@ obj-$(CONFIG_VIDEO_AU0828) += au0828/ | |||
155 | 157 | ||
156 | obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ | 158 | obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ |
157 | 159 | ||
160 | obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o | ||
161 | |||
158 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 162 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core |
159 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 163 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends |
160 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 164 | EXTRA_CFLAGS += -Idrivers/media/common/tuners |
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile index 3dbaa19a6d00..604158a8c235 100644 --- a/drivers/media/video/saa7134/Makefile +++ b/drivers/media/video/saa7134/Makefile | |||
@@ -3,8 +3,7 @@ saa7134-objs := saa7134-cards.o saa7134-core.o saa7134-i2c.o \ | |||
3 | saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o \ | 3 | saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o \ |
4 | saa7134-video.o saa7134-input.o | 4 | saa7134-video.o saa7134-input.o |
5 | 5 | ||
6 | obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o \ | 6 | obj-$(CONFIG_VIDEO_SAA7134) += saa6752hs.o saa7134.o saa7134-empress.o |
7 | saa6752hs.o | ||
8 | 7 | ||
9 | obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o | 8 | obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o |
10 | 9 | ||