From a325016c7bbd9dad332c5832eaa365b226c7d7d7 Mon Sep 17 00:00:00 2001 From: Franklin Meng Date: Sat, 13 Feb 2010 02:37:15 -0300 Subject: [PATCH] --- yaml --- r: 181703 b: refs/heads/master c: 9a0a75a5abb2806969a599e10b0fb287befcb3a7 h: refs/heads/master i: 181701: c4ffacf968718c63727b2132e13ed50f4e53ec3d 181699: 8e8dfcb0d7a4321e7884fb9daf78922da082bb3f 181695: c3bfbcd34548cd33cf9f9618ffefbd13d082981d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 1 + trunk/include/media/ir-common.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1eb41fe59178..976c2a9a8842 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 536004403d35b707bbac43d629586ee9c944084f +refs/heads/master: 9a0a75a5abb2806969a599e10b0fb287befcb3a7 diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index 48d7f7e284ad..77870a631efe 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -1280,6 +1280,7 @@ struct em28xx_board em28xx_boards[] = { .decoder = EM28XX_SAA711X, .has_dvb = 1, .dvb_gpio = em2882_kworld_315u_digital, + .ir_codes = &ir_codes_kworld_315u_table, .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE, /* Analog mode - still not ready */ diff --git a/trunk/include/media/ir-common.h b/trunk/include/media/ir-common.h index 8e2ab84ba23e..c66298062d39 100644 --- a/trunk/include/media/ir-common.h +++ b/trunk/include/media/ir-common.h @@ -163,4 +163,5 @@ extern struct ir_scancode_table ir_codes_videomate_s350_table; extern struct ir_scancode_table ir_codes_gadmei_rm008z_table; extern struct ir_scancode_table ir_codes_nec_terratec_cinergy_xs_table; extern struct ir_scancode_table ir_codes_winfast_usbii_deluxe_table; +extern struct ir_scancode_table ir_codes_kworld_315u_table; #endif