diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-18 19:57:19 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-18 19:57:19 +0100 |
| commit | 0befda04446c7f6c4bb400db7406acc4aa38376f (patch) | |
| tree | b1f0de63fb67473cea6ba54ff06f00c26442e1d7 /linux/drivers/media/video/tda7432.c | |
| parent | 853281d7ac18c7e109231a4d86a9565623531de2 (diff) | |
| parent | 2d0abb67a8d568f7bfd5ae1814cf1f34757237da (diff) | |
| download | mediapointer-dvb-s2-0befda04446c7f6c4bb400db7406acc4aa38376f.tar.gz mediapointer-dvb-s2-0befda04446c7f6c4bb400db7406acc4aa38376f.tar.bz2 | |
Merge from master
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/tda7432.c')
| -rw-r--r-- | linux/drivers/media/video/tda7432.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tda7432.c b/linux/drivers/media/video/tda7432.c index 4dc86710d..5f6bb19d0 100644 --- a/linux/drivers/media/video/tda7432.c +++ b/linux/drivers/media/video/tda7432.c @@ -49,13 +49,13 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#include "bttv.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #include "i2c-compat.h" #else #endif #include <media/audiochip.h> #include <media/v4l2-common.h> +#include <media/i2c-addr.h> #ifndef VIDEO_AUDIO_BALANCE # define VIDEO_AUDIO_BALANCE 32 @@ -76,7 +76,7 @@ module_param(maxvol, int, S_IRUGO | S_IWUSR); /* Address to scan (I2C address of this chip) */ static unsigned short normal_i2c[] = { - I2C_TDA7432 >> 1, + I2C_ADDR_TDA7432 >> 1, I2C_CLIENT_END, }; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) |