diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-07 14:17:02 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-07 14:17:02 +0000 |
| commit | aeac86abb3fdff12ddfb38503b35e195ab85ceab (patch) | |
| tree | 6842950190e5acbd48aa8e14d552441c993bc4e3 /linux/drivers | |
| parent | 7d7cba3bfd96e6e4fdef941efd6136966317ed70 (diff) | |
| download | mediapointer-dvb-s2-aeac86abb3fdff12ddfb38503b35e195ab85ceab.tar.gz mediapointer-dvb-s2-aeac86abb3fdff12ddfb38503b35e195ab85ceab.tar.bz2 | |
kernel-sync patches.
- kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/videodev.c | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 241a163aa..1002e3a91 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.77 2005/12/07 12:03:24 mchehab Exp $ + $Id: bttv-driver.c,v 1.78 2005/12/07 14:17:02 mchehab Exp $ bttv - Bt848 frame grabber driver @@ -4311,7 +4311,11 @@ static int bttv_init_module(void) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) bus_register(&bttv_sub_bus_type); #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) + return pci_module_init(&bttv_pci_driver); +#else return pci_register_driver(&bttv_pci_driver); +#endif } static void bttv_cleanup_module(void) diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 87372b160..81e82a024 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.84 2005/12/04 01:12:43 rmcc Exp $ + * $Id: saa7134.h,v 1.85 2005/12/07 14:17:03 mchehab Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <linux/utsname.h> +#include <linux/version.h> #define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,14) #include <linux/pci.h> diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index 6de5b0094..2411803b3 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -68,7 +68,8 @@ static void video_release(struct class_device *cd) { struct video_device *vfd = container_of(cd, struct video_device, class_dev); -#if 1 /* needed until all drivers are fixed */ +#if 1 /* keep */ + /* needed until all drivers are fixed */ if (!vfd->release) return; #endif @@ -344,7 +345,8 @@ int video_register_device(struct video_device *vfd, int type, int nr) class_device_create_file(&vfd->class_dev, &class_device_attr_name); -#if 1 /* needed until all drivers are fixed */ +#if 1 /* keep */ + /* needed until all drivers are fixed */ if (!vfd->release) printk(KERN_WARNING "videodev: \"%s\" has no release callback. " "Please fix your driver for proper sysfs support, see " |