Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 161621
b: refs/heads/master
c: 7e8e16c
h: refs/heads/master
i:
  161619: f92f10b
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Sep 12, 2009
1 parent dfa23a9 commit 3dbcf1b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 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: ac07bb73fe226ae2088f060c63829afddb3f2403
refs/heads/master: 7e8e16ca39801279697c6cb6195710ba7653bfc2
20 changes: 4 additions & 16 deletions trunk/drivers/media/video/em28xx/em28xx-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -2213,34 +2213,22 @@ void em28xx_register_i2c_ir(struct em28xx *dev)

/* detect & configure */
switch (dev->model) {
case (EM2800_BOARD_UNKNOWN):
break;
case (EM2820_BOARD_UNKNOWN):
break;
case (EM2800_BOARD_TERRATEC_CINERGY_200):
case (EM2820_BOARD_TERRATEC_CINERGY_250):
case EM2800_BOARD_TERRATEC_CINERGY_200:
case EM2820_BOARD_TERRATEC_CINERGY_250:
dev->init_data.ir_codes = &ir_codes_em_terratec_table;
dev->init_data.get_key = em28xx_get_key_terratec;
dev->init_data.name = "i2c IR (EM28XX Terratec)";
break;
case (EM2820_BOARD_PINNACLE_USB_2):
case EM2820_BOARD_PINNACLE_USB_2:
dev->init_data.ir_codes = &ir_codes_pinnacle_grey_table;
dev->init_data.get_key = em28xx_get_key_pinnacle_usb_grey;
dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
break;
case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
dev->init_data.ir_codes = &ir_codes_hauppauge_new_table;
dev->init_data.get_key = em28xx_get_key_em_haup;
dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
break;
case (EM2820_BOARD_MSI_VOX_USB_2):
break;
case (EM2800_BOARD_LEADTEK_WINFAST_USBII):
break;
case (EM2800_BOARD_KWORLD_USB2800):
break;
case (EM2800_BOARD_GRABBEEX_USB2800):
break;
}

if (dev->init_data.name)
Expand Down

0 comments on commit 3dbcf1b

Please sign in to comment.