diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-27 11:00:40 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-27 11:00:40 -0300 |
| commit | 4eebc35e388d275870454a6d509fefd629e98d98 (patch) | |
| tree | 3deb2eadb129c37dc3d5e97178158b078ec1a6b5 /v4l | |
| parent | 8b3ea3121de2ffb49fa878bf4307dce49d74bd81 (diff) | |
| parent | 2fc29f23f48a916f556d40ce8498ed27a0b1f0fc (diff) | |
| download | mediapointer-dvb-s2-4eebc35e388d275870454a6d509fefd629e98d98.tar.gz mediapointer-dvb-s2-4eebc35e388d275870454a6d509fefd629e98d98.tar.bz2 | |
Merge from http://linuxtv.org/hg/~mcisely/v4l-dvb
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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 66e3eb31f..772cac951 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -72,6 +72,7 @@ pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ pvrusb2-eeprom.o pvrusb2-tuner.o pvrusb2-demod.o \ pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \ pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \ + pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \ pvrusb2-ioread.o pvrusb2-debugifc.o dvb-firesat-objs := firesat.o avc_api.o cmp.o firesat-rc.o ivtv-objs := ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \ |