Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[sfrench/cifs-2.6.git] / drivers / media / video / cx23885 / cx23885-cards.c

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index d639186f645d66bdd3434a6da4bce2cd41be8288..2014daedee8b3b827bbffc11eab4095290ce356a 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -406,10 +406,18 @@ struct cx23885_subid cx23885_subids[] = {
                .subvendor = 0x0070,
                .subdevice = 0x2215,
                .card      = CX23885_BOARD_HAUPPAUGE_HVR1275,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x221d,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1275,
        }, {
                .subvendor = 0x0070,
                .subdevice = 0x2251,
                .card      = CX23885_BOARD_HAUPPAUGE_HVR1255,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x2259,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1255,
        }, {
                .subvendor = 0x0070,
                .subdevice = 0x2291,
@@ -418,6 +426,38 @@ struct cx23885_subid cx23885_subids[] = {
                .subvendor = 0x0070,
                .subdevice = 0x2295,
                .card      = CX23885_BOARD_HAUPPAUGE_HVR1210,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x2299,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1210,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x229d,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1210, /* HVR1215 */
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x22f0,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1210,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x22f1,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1255,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x22f2,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1275,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x22f3,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1210, /* HVR1215 */
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x22f4,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1210,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x22f5,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1210, /* HVR1215 */
        }, {
                .subvendor = 0x14f1,
                .subdevice = 0x8651,