diff options
Diffstat (limited to 'linux/drivers/media/video/tvmixer.c')
| -rw-r--r-- | linux/drivers/media/video/tvmixer.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c index 7468aaf5c..3a54674f2 100644 --- a/linux/drivers/media/video/tvmixer.c +++ b/linux/drivers/media/video/tvmixer.c @@ -18,6 +18,9 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) # include "i2c-compat.h" +# include "id.h" +#else +# include <media/id.h> #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,71) # define strlcpy(dest,src,len) strncpy(dest,src,(len)-1) @@ -286,8 +289,8 @@ static int tvmixer_clients(struct i2c_client *client) struct video_audio va; int i,minor; -#ifdef I2C_ADAP_CLASS_TV_ANALOG - if (!(client->adapter->class & I2C_ADAP_CLASS_TV_ANALOG)) +#ifdef I2C_CLASS_TV_ANALOG + if (!(client->adapter->class & I2C_CLASS_TV_ANALOG)) return -1; #else /* TV card ??? */ |