diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-29 09:16:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-29 09:16:25 +0200 |
| commit | 348b346b238d9c0e5694c8d0b835a099cb383835 (patch) | |
| tree | 967d9c72a1d6d33a408a1ff0d732296dbe8d3674 /drivers/media/dvb/frontends/stv0900.h | |
| parent | 6c697bdf08a09ce461e305a22362973036e95db3 (diff) | |
| parent | 52989765629e7d182b4f146050ebba0abf2cb0b7 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: we will merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/dvb/frontends/stv0900.h')
| -rw-r--r-- | drivers/media/dvb/frontends/stv0900.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/stv0900.h b/drivers/media/dvb/frontends/stv0900.h index 8a1332c2031..bf4e9b63304 100644 --- a/drivers/media/dvb/frontends/stv0900.h +++ b/drivers/media/dvb/frontends/stv0900.h @@ -29,6 +29,11 @@ #include <linux/dvb/frontend.h> #include "dvb_frontend.h" +struct stv0900_reg { + u16 addr; + u8 val; +}; + struct stv0900_config { u8 demod_address; u32 xtal; @@ -38,7 +43,7 @@ struct stv0900_config { u8 path1_mode; u8 path2_mode; - + struct stv0900_reg *ts_config_regs; u8 tun1_maddress;/* 0, 1, 2, 3 for 0xc0, 0xc2, 0xc4, 0xc6 */ u8 tun2_maddress; u8 tun1_adc;/* 1 for stv6110, 2 for stb6100 */ |