diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /drivers/char/bttv.h | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'drivers/char/bttv.h')
| -rw-r--r-- | drivers/char/bttv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/bttv.h b/drivers/char/bttv.h index c1e9b3e9a..7dd6f046b 100644 --- a/drivers/char/bttv.h +++ b/drivers/char/bttv.h @@ -21,7 +21,7 @@ #ifndef _BTTV_H_ #define _BTTV_H_ -#define BTTV_VERSION_CODE KERNEL_VERSION(0,7,24) +#define BTTV_VERSION_CODE KERNEL_VERSION(0,7,25) #include <linux/types.h> #include <linux/wait.h> @@ -138,7 +138,7 @@ struct bttv { struct i2c_adapter i2c_adap; struct i2c_algo_bit_data i2c_algo; struct i2c_client i2c_client; - int i2c_state; + int i2c_state, i2c_ok; struct i2c_client *i2c_clients[I2C_CLIENTS_MAX]; int tuner_type; @@ -270,6 +270,7 @@ extern __inline__ void io_st_le32(volatile unsigned *addr, unsigned val) #define BTTV_CHRONOS_VS2 0x23 #define BTTV_TYPHOON_TVIEW 0x24 #define BTTV_PXELVWPLTVPRO 0x25 +#define BTTV_MAGICTVIEW063 0x26 #define AUDIO_TUNER 0x00 |