diff options
| author | Michael Hunold <devnull@localhost> | 2003-03-20 07:55:39 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-03-20 07:55:39 +0000 |
| commit | e5652dff1fcf6156d33686bc1879601ab5c06d47 (patch) | |
| tree | 60b5000d2d6e70b1aedf4b56224eb1a0cbc3e273 /linux/drivers/media/video | |
| parent | 11da1df41eb8d96639be460e238ef3f8fcad2ba9 (diff) | |
| download | mediapointer-dvb-s2-e5652dff1fcf6156d33686bc1879601ab5c06d47.tar.gz mediapointer-dvb-s2-e5652dff1fcf6156d33686bc1879601ab5c06d47.tar.bz2 | |
Necessary changes to the analog saa7146 based video drivers due
to the movement of the header files, sync Kconfig and Makefile
with 2.5.65
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/dpc7146.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/video/mxb.c | 18 |
2 files changed, 16 insertions, 9 deletions
diff --git a/linux/drivers/media/video/dpc7146.c b/linux/drivers/media/video/dpc7146.c index 2d0b45e9a..ee2eb280f 100644 --- a/linux/drivers/media/video/dpc7146.c +++ b/linux/drivers/media/video/dpc7146.c @@ -19,8 +19,8 @@ */ #define DEBUG_VARIABLE debug -#include "saa7146_vv.h" +#include <media/saa7146_vv.h> #include <linux/video_decoder.h> /* for saa7111a */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) @@ -117,7 +117,10 @@ static int dpc_probe(struct saa7146_dev* dev) } /* loop through all i2c-devices on the bus and look who is there */ - for(i = 0; i < dpc->i2c_adapter.client_count; i++) { + for(i = 0; i < I2C_CLIENT_MAX; i++) { + if( NULL == dpc->i2c_adapter.clients[i] ) { + continue; + } if( I2C_SAA7111A == dpc->i2c_adapter.clients[i]->addr ) dpc->saa7111a = dpc->i2c_adapter.clients[i]; } diff --git a/linux/drivers/media/video/mxb.c b/linux/drivers/media/video/mxb.c index c9fe808d2..c5a5e6921 100644 --- a/linux/drivers/media/video/mxb.c +++ b/linux/drivers/media/video/mxb.c @@ -22,19 +22,20 @@ */ #define DEBUG_VARIABLE debug -#include "saa7146_vv.h" -#include "mxb.h" -#include "tea6415c.h" -#include "tea6420.h" -#include "tda9840.h" -#include "tuner.h" +#include <media/saa7146_vv.h> #include <linux/video_decoder.h> /* for saa7111a */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) #define KBUILD_MODNAME mxb #endif +#include "mxb.h" +#include "tea6415c.h" +#include "tea6420.h" +#include "tda9840.h" +#include <media/tuner.h> + #define I2C_SAA7111A 0x24 /* All unused bytes are reserverd. */ @@ -231,7 +232,10 @@ static int mxb_probe(struct saa7146_dev* dev) } /* loop through all i2c-devices on the bus and look who is there */ - for(i = 0; i < mxb->i2c_adapter.client_count; i++) { + for(i = 0; i < I2C_CLIENT_MAX; i++) { + if( NULL == mxb->i2c_adapter.clients[i] ) { + continue; + } if( I2C_TEA6420_1 == mxb->i2c_adapter.clients[i]->addr ) mxb->tea6420_1 = mxb->i2c_adapter.clients[i]; if( I2C_TEA6420_2 == mxb->i2c_adapter.clients[i]->addr ) |