summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-03-29 19:32:30 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2006-03-29 19:32:30 +0200
commitcc503cb2fceaaa0e85f3fc7df46abbb4c8bfe10c (patch)
tree59019fdab8dae4433b4e3af04676ef9550b3193b /v4l
parenta7aa675c92fa3d11e83bf8990e98fd06e2c95459 (diff)
parent8cb185c4aa68c43b8b1c9c964c7ab785ecfbb928 (diff)
downloadmediapointer-dvb-s2-cc503cb2fceaaa0e85f3fc7df46abbb4c8bfe10c.tar.gz
mediapointer-dvb-s2-cc503cb2fceaaa0e85f3fc7df46abbb4c8bfe10c.tar.bz2
merge: from master.
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index 772cac951..a9c0d1fa5 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -115,7 +115,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,7 +309,7 @@ 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