diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/Kconfig | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/tda9840.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/tea6415c.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/tea6420.c | 3 | ||||
| -rwxr-xr-x | v4l/scripts/makelinks.sh | 22 |
5 files changed, 23 insertions, 13 deletions
diff --git a/linux/drivers/media/video/cx88/Kconfig b/linux/drivers/media/video/cx88/Kconfig index e140996e6..ff0f72340 100644 --- a/linux/drivers/media/video/cx88/Kconfig +++ b/linux/drivers/media/video/cx88/Kconfig @@ -16,12 +16,13 @@ config VIDEO_CX88 module will be called cx8800 config VIDEO_CX88_ALSA - tristate "ALSA DMA audio support" + tristate "Conexant 2388x DMA audio support" depends on VIDEO_CX88 && SND && EXPERIMENTAL select SND_PCM ---help--- This is a video4linux driver for direct (DMA) audio on - Conexant 2388x based TV cards. + Conexant 2388x based TV cards using ALSA. + It only works with boards with function 01 enabled. To check if your board supports, use lspci -n. If supported, you should see 1471:8801 or 1471:8811 diff --git a/linux/drivers/media/video/tda9840.c b/linux/drivers/media/video/tda9840.c index 4677399db..42a842aec 100644 --- a/linux/drivers/media/video/tda9840.c +++ b/linux/drivers/media/video/tda9840.c @@ -46,6 +46,9 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); /* addresses to scan, found only at 0x42 (7-Bit) */ static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, I2C_CLIENT_END }; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; +#endif /* magic definition of all other variables and things */ I2C_CLIENT_INSMOD; diff --git a/linux/drivers/media/video/tea6415c.c b/linux/drivers/media/video/tea6415c.c index 12e83ad21..98434efb0 100644 --- a/linux/drivers/media/video/tea6415c.c +++ b/linux/drivers/media/video/tea6415c.c @@ -46,6 +46,9 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); /* addresses to scan, found only at 0x03 and/or 0x43 (7-bit) */ static unsigned short normal_i2c[] = { I2C_TEA6415C_1, I2C_TEA6415C_2, I2C_CLIENT_END }; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; +#endif /* magic definition of all other variables and things */ I2C_CLIENT_INSMOD; diff --git a/linux/drivers/media/video/tea6420.c b/linux/drivers/media/video/tea6420.c index 27454cbb8..b5e41f49b 100644 --- a/linux/drivers/media/video/tea6420.c +++ b/linux/drivers/media/video/tea6420.c @@ -43,6 +43,9 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */ static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I2C_CLIENT_END }; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; +#endif /* magic definition of all other variables and things */ I2C_CLIENT_INSMOD; diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index 44fa17759..a66989771 100755 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -26,26 +26,26 @@ for x in `find include -type d | grep -v CVS` ; do done for x in `find Documentation -type f | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x + ln -f -s $PWD/$x $1/$x done for x in `find drivers -type f | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x + ln -f -s $PWD/$x $1/$x done for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x + ln -f -s $PWD/$x $1/$x done -cd .. +for x in `find include -type d | grep -v CVS` ; do + ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h +done -ln -v -f -s $PWD/v4l/compat.h $1/include/media/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/include/linux/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/common/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/bt8xx/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/cinergyT2/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/dvb-core/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/video/compat.h +for x in `find drivers/media -type d | grep -v CVS` ; do + ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h +done + +cd .. patch -p0 <<'DIFF' diff -u -p videodev.h --- linux/include/linux/videodev.h |