Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181661
b: refs/heads/master
c: 0a71102
h: refs/heads/master
i:
  181659: 517b0fc
v: v3
  • Loading branch information
Douglas Schilling Landgraf authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent e5e3059 commit ecef0f6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 87147ff03a8aa27b9cc94872b195e6f8bb922feb
refs/heads/master: 0a71102f105870a4a245edd1b291fa723a8f3a48
9 changes: 4 additions & 5 deletions trunk/drivers/media/video/em28xx/em28xx-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -2300,6 +2300,10 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
dev->init_data.ir_codes = &ir_codes_rc5_hauppauge_new_table;
dev->init_data.get_key = em28xx_get_key_em_haup;
dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
dev->init_data.ir_codes = &ir_codes_winfast_usbii_deluxe_table;;
dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)";
break;
}

Expand Down Expand Up @@ -2356,11 +2360,6 @@ void em28xx_card_setup(struct em28xx *dev)
dev->board.has_msp34xx = 1;
}
break;
case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
dev->init_data.ir_codes = &ir_codes_winfast_usbii_deluxe_table;;
dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)";
break;
}
case EM2882_BOARD_KWORLD_ATSC_315U:
em28xx_write_reg(dev, 0x0d, 0x42);
Expand Down

0 comments on commit ecef0f6

Please sign in to comment.