From 37678fc32ab2844a6b5a8333db8457c2b2bc211f Mon Sep 17 00:00:00 2001 From: Sascha Sommer Date: Tue, 8 Nov 2005 21:37:37 -0800 Subject: [PATCH] --- yaml --- r: 13364 b: refs/heads/master c: 16f2e6229f6f7b89cb42f4942cb46dc645faae2a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-input.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2b02fcf7f30e..e2ca7f2879e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f9c05aa727a3b27e28972f2f3938b29ad81b833 +refs/heads/master: 16f2e6229f6f7b89cb42f4942cb46dc645faae2a diff --git a/trunk/drivers/media/video/em28xx/em28xx-input.c b/trunk/drivers/media/video/em28xx/em28xx-input.c index 0576ad6c42b7..ba367a9796e7 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-input.c +++ b/trunk/drivers/media/video/em28xx/em28xx-input.c @@ -150,6 +150,7 @@ void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) break; case (EM2820_BOARD_UNKNOWN): break; + case (EM2800_BOARD_TERRATEC_CINERGY_200): case (EM2820_BOARD_TERRATEC_CINERGY_250): ir->ir_codes = ir_codes_em_terratec; ir->get_key = get_key_terratec; @@ -164,8 +165,6 @@ void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) break; case (EM2820_BOARD_MSI_VOX_USB_2): break; - case (EM2800_BOARD_TERRATEC_CINERGY_200): - break; case (EM2800_BOARD_LEADTEK_WINFAST_USBII): break; case (EM2800_BOARD_KWORLD_USB2800):