Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[linux-2.6] / drivers / media / video / bt8xx / bttv-input.c

diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index fc9ecb21eec6e66311e773126f93f3ab74bfe582..a38af98f4cae9e33ad4f47cd1873407a47c34dab 100644 (file)
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -278,6 +278,12 @@ int bttv_input_init(struct bttv *btv)
                ir->mask_keyup   = 0x004000;
                ir->polling      = 50; /* ms */
                break;
+       case BTTV_BOARD_KOZUMI_KTV_01C:
+               ir_codes         = ir_codes_pctv_sedna;
+               ir->mask_keycode = 0x001f00;
+               ir->mask_keyup   = 0x006000;
+               ir->polling      = 50; /* ms */
+               break;
        }
        if (NULL == ir_codes) {
                dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type);