diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-23 19:45:24 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-24 14:26:51 -0500 |
commit | fa3fcceb30eb8a3cb2ac299c207c6f89b9aed379 (patch) | |
tree | 5cd9df4a0591aec9c1e69f19c2f34c40a0914f2a /drivers/media/video/bt8xx/bttv.h | |
parent | c72602b8250cc0d3ace59d1a7334c5cd7aa9490e (diff) |
V4L/DVB (3546): Fix Compilation after moving bttv code
- Missing a Makefile for bt8xx
- rds.h were at wrong directory, since it is a global header for an internal
interface
- tda7432 and tda9875 were dependent from bttv.h
- bttv.h were holding i2c addresses
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bt8xx/bttv.h')
-rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h index 9908c8e0c951..ebde3e8219cf 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
19 | #include <media/ir-common.h> | 19 | #include <media/ir-common.h> |
20 | #include <media/ir-kbd-i2c.h> | 20 | #include <media/ir-kbd-i2c.h> |
21 | #include <media/i2c-addr.h> | ||
21 | 22 | ||
22 | /* ---------------------------------------------------------- */ | 23 | /* ---------------------------------------------------------- */ |
23 | /* exported by bttv-cards.c */ | 24 | /* exported by bttv-cards.c */ |
@@ -168,25 +169,6 @@ | |||
168 | #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f | 169 | #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f |
169 | #define BTTV_BOARD_MACHTV_MAGICTV 0x90 | 170 | #define BTTV_BOARD_MACHTV_MAGICTV 0x90 |
170 | 171 | ||
171 | /* i2c address list */ | ||
172 | #define I2C_TSA5522 0xc2 | ||
173 | #define I2C_TDA7432 0x8a | ||
174 | #define I2C_BT832_ALT1 0x88 | ||
175 | #define I2C_BT832_ALT2 0x8a // alternate setting | ||
176 | #define I2C_TDA8425 0x82 | ||
177 | #define I2C_TDA9840 0x84 | ||
178 | #define I2C_TDA9850 0xb6 /* also used by 9855,9873 */ | ||
179 | #define I2C_TDA9874 0xb0 /* also used by 9875 */ | ||
180 | #define I2C_TDA9875 0xb0 | ||
181 | #define I2C_HAUPEE 0xa0 | ||
182 | #define I2C_STBEE 0xae | ||
183 | #define I2C_VHX 0xc0 | ||
184 | #define I2C_MSP3400 0x80 | ||
185 | #define I2C_MSP3400_ALT 0x88 | ||
186 | #define I2C_TEA6300 0x80 /* also used by 6320 */ | ||
187 | #define I2C_DPL3518 0x84 | ||
188 | #define I2C_TDA9887 0x86 | ||
189 | |||
190 | /* more card-specific defines */ | 172 | /* more card-specific defines */ |
191 | #define PT2254_L_CHANNEL 0x10 | 173 | #define PT2254_L_CHANNEL 0x10 |
192 | #define PT2254_R_CHANNEL 0x08 | 174 | #define PT2254_R_CHANNEL 0x08 |