diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-04 08:23:44 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-04 08:23:44 -0300 |
| commit | e5108b164b4e23e5d70b3db8ed6da9479366d289 (patch) | |
| tree | 7f38b0a749b3082567017491a06ad1a8519c272c /v4l | |
| parent | cc7536722d24a3deec8ac51616e26f5dc267f112 (diff) | |
| parent | 9fea63f4c39cf81e86921ea4a0c440029f6d49b9 (diff) | |
| download | mediapointer-dvb-s2-e5108b164b4e23e5d70b3db8ed6da9479366d289.tar.gz mediapointer-dvb-s2-e5108b164b4e23e5d70b3db8ed6da9479366d289.tar.bz2 | |
merge from http://linuxtv.org/hg/~mkrufky/trivial
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, 4 insertions, 4 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 3a26fbdbe..a66036f68 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -336,8 +336,8 @@ inst_em28xx := em28xx.ko 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 += nxt200x.ko cx24123.ko mt312.ko stv0299.ko bcm3510.ko +inst_frontends += dib3000-common.ko dib3000mb.ko dib3000mc.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 @@ -346,8 +346,8 @@ inst_saa7146 := saa7146.ko saa7146_vv.ko inst_b2c2 := b2c2-flexcop.ko b2c2-flexcop-pci.ko b2c2-flexcop-usb.ko inst_cinergyT2 := cinergyT2.ko inst_dvb-usb := dvb-usb.ko dvb-usb-vp7045.ko dvb-usb-vp702x.ko -inst_dvb-usb += dvb-usb-dtt200u.ko dvb-usb-a800.ko dvb-usb-dibusb-mb.ko -inst_dvb-usb += dvb-usb-dibusb-mc.ko dvb-usb-nova-t-usb2.ko +inst_dvb-usb += dvb-usb-dtt200u.ko dvb-usb-a800.ko dvb-usb-nova-t-usb2.ko +inst_dvb-usb += dvb-usb-dibusb-common.ko dvb-usb-dibusb-mc.ko dvb-usb-dibusb-mb.ko inst_dvb-usb += dvb-usb-umt-010.ko dvb-usb-digitv.ko dvb-usb-cxusb.ko inst_pluto2 := pluto2.ko inst_ttpci := budget-core.ko budget.ko ttpci-eeprom.ko budget-av.ko |