diff options
| -rw-r--r-- | linux/drivers/media/video/saa7164/Kconfig | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7164/saa7164-core.c | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | v4l/scripts/saa7164.pl | 0 | ||||
| -rw-r--r-- | v4l/versions.txt | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7164/Kconfig b/linux/drivers/media/video/saa7164/Kconfig index 582556792..353263725 100644 --- a/linux/drivers/media/video/saa7164/Kconfig +++ b/linux/drivers/media/video/saa7164/Kconfig @@ -1,7 +1,6 @@ config VIDEO_SAA7164 tristate "NXP SAA7164 support" depends on DVB_CORE && PCI && I2C - depends on HOTPLUG # due to FW_LOADER select I2C_ALGOBIT select FW_LOADER select VIDEO_TUNER @@ -9,7 +8,7 @@ config VIDEO_SAA7164 select VIDEOBUF_DVB select DVB_TDA10048 if !DVB_FE_CUSTOMISE select DVB_S5H1411 if !DVB_FE_CUSTOMISE - select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE + select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE ---help--- This is a video4linux driver for NXP SAA7164 based TV cards. diff --git a/linux/drivers/media/video/saa7164/saa7164-core.c b/linux/drivers/media/video/saa7164/saa7164-core.c index 91dbb1ac0..77eb7331b 100644 --- a/linux/drivers/media/video/saa7164/saa7164-core.c +++ b/linux/drivers/media/video/saa7164/saa7164-core.c @@ -109,7 +109,7 @@ static void saa7164_buffer_deliver(struct saa7164_buffer *buf) } #endif /* Feed the transport payload into the kernel demux */ - dvb_dmx_swfilter_packets(&port->dvb.demux, buf->cpu, + dvb_dmx_swfilter_packets(&port->dvb.demux, (u8 *)buf->cpu, SAA7164_TS_NUMBER_OF_LINES); } diff --git a/v4l/scripts/saa7164.pl b/v4l/scripts/saa7164.pl index 95c5eb579..95c5eb579 100644..100755 --- a/v4l/scripts/saa7164.pl +++ b/v4l/scripts/saa7164.pl diff --git a/v4l/versions.txt b/v4l/versions.txt index 54108741d..21e02e2a6 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -40,7 +40,6 @@ SOC_CAMERA_PLATFORM VIDEO_TVP514X # requires id_table and new i2c stuff RADIO_TEA5764 -VIDEO_SAA7164 VIDEO_THS7303 VIDEO_ADV7343 RADIO_SI4713 @@ -51,6 +50,7 @@ I2C_SI4713 USB_GSPCA_SN9C20X_EVDEV # Requires linux/mmc/sdio_func.h SMS_SDIO_DRV +VIDEO_SAA7164 [2.6.23] # Needs field intf_assoc in struct usb_host_config |