diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-29 15:50:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-29 15:50:59 -0300 |
| commit | c2f053a3449de316fe16d31c02dffd44e8102693 (patch) | |
| tree | bc7c78333e506ebda69071cc9d1f25ff5cbe3de4 /v4l | |
| parent | d2f9849264786f56967fb28a66a295c79c29b322 (diff) | |
| parent | f8f26c1536f4aa9e1329fb70979cdab63fdda0c0 (diff) | |
| download | mediapointer-dvb-s2-c2f053a3449de316fe16d31c02dffd44e8102693.tar.gz mediapointer-dvb-s2-c2f053a3449de316fe16d31c02dffd44e8102693.tar.bz2 | |
Merging from hverkuil tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 772cac951..0b14488ee 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -99,7 +99,8 @@ obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \ obj-$(CONFIG_VIDEO_CX88_IVTV) += cx88-ivtv.o obj-$(CONFIG_TVP5150) += tvp5150.o obj-$(CONFIG_EM28XX) += em28xx.o tveeprom.o -obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840.o saa7127.o bt832.o +obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840.o saa7127.o bt832.o \ + upd64031a.o upd64083.o ifeq ($(CONFIG_VIDEO_ALSA),y) EXTRA_CFLAGS += -DUSING_CX88_ALSA=1 @@ -115,7 +116,7 @@ obj-$(CONFIG_VIDEO_SAA7134) += saa7134-oss.o obj-$(CONFIG_VIDEO_IR) += ir-common.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o saa6588.o obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o wm8775.o \ - cs53l32a.o tda7432.o tda9875.o + wm8739.o cs53l32a.o tda7432.o tda9875.o obj-$(CONFIG_VIDEO_CPIA2) += cpia2.o obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx88-vp3054-i2c.o @@ -309,12 +310,13 @@ endif inst_common := ir-common.ko inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko saa6588.ko #inst_video += bt87x.ko -inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.ko +inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko wm8739.ko cs53l32a.ko inst_video += video-buf.ko video-buf-dvb.ko inst_video += videodev.ko inst_video += ir-kbd-i2c.ko msp3400.ko inst_video += tvp5150.ko saa7134-alsa.ko saa7134-oss.ko inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko +inst_video += upd64031a.ko upd64083.ko inst_cx88 := cx88xx.ko cx8800.ko cx8802.ko cx88-alsa.ko cx88-dvb.ko inst_video += vivi.ko inst_cx88 += cx88-blackbird.ko cx88-vp3054-i2c.ko cx88-ivtv.ko |