diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-03-31 23:51:05 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-03-31 23:51:05 +0200 |
| commit | c789b52b2663b1480d58991d59292687f2501189 (patch) | |
| tree | 64461dca24827c90dde47cae2f453d25e2901e35 /v4l/Makefile | |
| parent | b03dad0db6b312169fd2e16c18187703b23ecd38 (diff) | |
| parent | 910d6937144c2318a6c28fbd58ca417a6c988cdc (diff) | |
| download | mediapointer-dvb-s2-c789b52b2663b1480d58991d59292687f2501189.tar.gz mediapointer-dvb-s2-c789b52b2663b1480d58991d59292687f2501189.tar.bz2 | |
merge: from v4l-dvb main
From: Patrick Boettcher <pb@linuxtv.org>
merge: from main
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'v4l/Makefile')
| -rw-r--r-- | v4l/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 0b14488ee..ef3dc46e7 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -129,7 +129,8 @@ obj-$(CONFIG_DVB_FRONTENDS) += dvb-pll.o cx22702.o or51132.o lgdt330x.o \ dib3000-common.o dib3000mb.o dib3000mc.o \ ves1820.o cx22700.o tda8083.o ves1x93.o \ stv0297.o sp8870.o l64781.o s5h1420.o \ - tda10021.o at76c651.o tda80xx.o zl10353.o + tda10021.o at76c651.o tda80xx.o zl10353.o \ + mt2060.o obj-$(CONFIG_DVB_CORE) += dvb-core.o obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o obj-$(CONFIG_DVB_B2C2_FLEXCOP) += stv0297_cs2.o @@ -326,10 +327,10 @@ inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko inst_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko -inst_frontends += bcm3510.ko dib3000mb.ko dib3000mc.ko ves1820.ko +inst_frontends += bcm3510.ko dib3000mb.ko dib3000mc.ko dib3000-common.ko ves1820.ko inst_frontends += cx22700.ko tda8083.ko ves1x93.ko stv0297.ko sp8870.ko inst_frontends += l64781.ko s5h1420.ko tda10021.ko at76c651.ko tda80xx.ko -inst_frontends += stv0297_cs2.ko zl10353.ko +inst_frontends += stv0297_cs2.ko zl10353.ko mt2060.ko inst_dvb-core := dvb-core.ko inst_saa7146 := saa7146.ko saa7146_vv.ko inst_b2c2 := b2c2-flexcop.ko b2c2-flexcop-pci.ko b2c2-flexcop-usb.ko |