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

[linux-2.6] / drivers / media / video / ir-kbd-i2c.c

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 04f6eb5ea2927add42794cc8f32fec8719d9dc8f..29779d8bf7fbecbc0e33ade96d51a75ef0c30e03 100644 (file)
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -507,6 +507,7 @@ static int ir_probe(struct i2c_adapter *adap)
        static const int probe_saa7134[] = { 0x7a, 0x47, 0x71, -1 };
        static const int probe_em28XX[] = { 0x30, 0x47, -1 };
        static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 };
+       static const int probe_cx23885[] = { 0x6b, -1 };
        const int *probe = NULL;
        struct i2c_client c;
        unsigned char buf;
@@ -528,6 +529,9 @@ static int ir_probe(struct i2c_adapter *adap)
        case I2C_HW_B_CX2388x:
                probe = probe_cx88;
                break;
+       case I2C_HW_B_CX23885:
+               probe = probe_cx23885;
+               break;
        }
        if (NULL == probe)
                return 0;