diff options
| -rw-r--r-- | linux/drivers/media/common/ir-functions.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/common/ir-keymaps.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/or51132.c | 2 | ||||
| -rw-r--r-- | v4l/Makefile | 8 |
5 files changed, 6 insertions, 8 deletions
diff --git a/linux/drivers/media/common/ir-functions.c b/linux/drivers/media/common/ir-functions.c index 8b7dd6e3e..3b988b012 100644 --- a/linux/drivers/media/common/ir-functions.c +++ b/linux/drivers/media/common/ir-functions.c @@ -278,4 +278,3 @@ EXPORT_SYMBOL_GPL(ir_decode_pulsedistance); * c-basic-offset: 8 * End: */ - diff --git a/linux/drivers/media/common/ir-keymaps.c b/linux/drivers/media/common/ir-keymaps.c index 03c4a7c50..1cdd5b0df 100644 --- a/linux/drivers/media/common/ir-keymaps.c +++ b/linux/drivers/media/common/ir-keymaps.c @@ -1476,4 +1476,3 @@ IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE] = { }; EXPORT_SYMBOL_GPL(ir_codes_hauppauge_new); - diff --git a/linux/drivers/media/dvb/frontends/Kconfig b/linux/drivers/media/dvb/frontends/Kconfig index 37d5e0af1..6d90ff3f7 100644 --- a/linux/drivers/media/dvb/frontends/Kconfig +++ b/linux/drivers/media/dvb/frontends/Kconfig @@ -157,7 +157,7 @@ config DVB_STV0297 help A DVB-C tuner module. Say Y when you want to support this frontend. -comment "ATSC (North American/Korean Terresterial DTV) frontends" +comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends" depends on DVB_CORE config DVB_NXT200X diff --git a/linux/drivers/media/dvb/frontends/or51132.c b/linux/drivers/media/dvb/frontends/or51132.c index dca1de555..a2a19aeb3 100644 --- a/linux/drivers/media/dvb/frontends/or51132.c +++ b/linux/drivers/media/dvb/frontends/or51132.c @@ -183,7 +183,7 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware for(i=0;i<4;i++) { msleep(20); /* 20ms */ - /* One apon a time, this command might have had something + /* Once upon a time, this command might have had something to do with getting the firmware version, but it's not used anymore: {0x04,0x00,0x30,0x00,i+1} */ 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 |