diff --git a/[refs] b/[refs] index 4efa08e1bfc9..88cea6119afe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e66131cee501ee720b7b58a4b87073b8fbaaaba6 +refs/heads/master: 2d12421dd39e39f9cacd9c7a58359c0f85823343 diff --git a/trunk/drivers/media/video/cx23885/cx23885-cards.c b/trunk/drivers/media/video/cx23885/cx23885-cards.c index 9fa4db27ae4f..76b7563de39c 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-cards.c +++ b/trunk/drivers/media/video/cx23885/cx23885-cards.c @@ -36,6 +36,10 @@ #include "xc5000.h" #include "cx23888-ir.h" +static unsigned int netup_card_rev = 1; +module_param(netup_card_rev, int, 0644); +MODULE_PARM_DESC(netup_card_rev, + "NetUP Dual DVB-T/C CI card revision"); static unsigned int enable_885_ir; module_param(enable_885_ir, int, 0644); MODULE_PARM_DESC(enable_885_ir, @@ -1441,6 +1445,9 @@ void cx23885_card_setup(struct cx23885_dev *dev) netup_initialize(dev); netup_get_card_info(&dev->i2c_bus[0].i2c_adap, &cinfo); + if (netup_card_rev) + cinfo.rev = netup_card_rev; + switch (cinfo.rev) { case 0x4: filename = "dvb-netup-altera-04.fw";