diff options
| author | Gerd Knorr <devnull@localhost> | 2004-09-20 11:39:43 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-09-20 11:39:43 +0000 |
| commit | 21bcc573babc73118ca0db46e9513dfcaed399e2 (patch) | |
| tree | 1ccf22ccf0fa2722d3a0f52e464ffa748ae62c85 /linux/drivers/media/video/cx88 | |
| parent | 1e8c9850492fee791a27f604a07f94106a33bc2b (diff) | |
| download | mediapointer-dvb-s2-21bcc573babc73118ca0db46e9513dfcaed399e2.tar.gz mediapointer-dvb-s2-21bcc573babc73118ca0db46e9513dfcaed399e2.tar.bz2 | |
- bttv: dark red image fixed (thanks to jeremy smith).
- misc cx88 tweaks.
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 11 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-i2c.c | 8 |
2 files changed, 5 insertions, 14 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 4c5b05339..ea8c9466a 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-cards.c,v 1.37 2004/09/16 15:38:41 kraxel Exp $ + * $Id: cx88-cards.c,v 1.38 2004/09/20 11:39:43 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -189,7 +189,7 @@ struct cx88_board cx88_boards[] = { .gpio2 = 0x0000ff40, }}, .radio = { - .type = CX88_RADIO, + .type = CX88_RADIO, }, }, [CX88_BOARD_WINFAST_DV2000] = { @@ -746,11 +746,6 @@ void cx88_card_setup(struct cx88_core *core) i2c_eeprom(&core->i2c_client,eeprom,sizeof(eeprom)); leadtek_eeprom(core,eeprom); break; - case CX88_BOARD_ASUS_PVR_416: - case CX88_BOARD_MSI_TVANYWHERE_MASTER: - case CX88_BOARD_KWORLD_LTV883: - core->has_radio = 1; - break; case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: /* Tuner reset is hooked to the tuner out of reset */ cx_set(MO_GP0_IO, 0x00000101); @@ -766,6 +761,8 @@ void cx88_card_setup(struct cx88_core *core) } if (frontend) request_module(frontend); + if (cx88_boards[core->board].radio.type == CX88_RADIO) + core->has_radio = 1; } /* ------------------------------------------------------------------ */ diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c index c01317786..64590c5cb 100644 --- a/linux/drivers/media/video/cx88/cx88-i2c.c +++ b/linux/drivers/media/video/cx88/cx88-i2c.c @@ -1,5 +1,5 @@ /* - $Id: cx88-i2c.c,v 1.12 2004/09/16 07:05:48 kraxel Exp $ + $Id: cx88-i2c.c,v 1.13 2004/09/20 11:39:43 kraxel Exp $ cx88-i2c.c -- all the i2c code is here @@ -38,12 +38,6 @@ MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]"); #define dprintk(level,fmt, arg...) if (i2c_debug >= level) \ printk(KERN_DEBUG "%s: " fmt, core->name , ## arg) -/* temporary here until new dvb-kernel code is merged ... */ -#ifndef FE_REGISTER -# define FE_REGISTER _IO ('v', 84) -# define FE_UNREGISTER _IO ('v', 85) -#endif - /* ----------------------------------------------------------------------- */ void cx8800_bit_setscl(void *data, int state) |