summaryrefslogtreecommitdiffstats
path: root/drivers/char/bttv.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-01-21 22:34:01 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-01-21 22:34:01 +0000
commit9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch)
treeb19e6acb5a67af31a4e7742e05c2166dc3f1444c /drivers/char/bttv.h
parent72919904796333a20c6a5d5c380091b42e407aa9 (diff)
Merge with Linux 2.3.22.
Diffstat (limited to 'drivers/char/bttv.h')
-rw-r--r--drivers/char/bttv.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/bttv.h b/drivers/char/bttv.h
index 83c9f1e8f..3126cce57 100644
--- a/drivers/char/bttv.h
+++ b/drivers/char/bttv.h
@@ -213,6 +213,10 @@ struct bttv
#define BTTV_PIXVIEWPLAYTV 0x10
#define BTTV_WINVIEW_601 0x11
#define BTTV_AVEC_INTERCAP 0x12
+#define BTTV_LIFE_FLYKIT 0x13
+#define BTTV_CEI_RAFFLES 0x14
+#define BTTV_CONFERENCETV 0x15
+#define BTTV_PHOEBE_TVMAS 0x16
#define AUDIO_TUNER 0x00
#define AUDIO_RADIO 0x01
@@ -237,6 +241,7 @@ struct bttv
#define I2C_STBEE 0xae
#define I2C_VHX 0xc0
#define I2C_TEA6300 0x80 /* same as TEA6320 */
+#define I2C_TEA6320 0x80
#define TDA9840_SW 0x00
#define TDA9840_LVADJ 0x02