kernel-sync patches.

- kernel-sync

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

5 files changed, 31 insertions, 10 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 "
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index 2e8e34792..60f4d88d6 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -1,5 +1,5 @@
-/* $Id: tuner.h,v 1.64 2005/12/05 21:26:37 hverkuil Exp $
- *
+/*
+    $Id: tuner.h,v 1.65 2005/12/07 14:17:03 mchehab Exp $
     tuner.h - definition for different tuners
 
     Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 86f517069..bef0dddba 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,18 @@
+2005-12-07 14:12  mchehab
+
+	* linux/drivers/media/video/bttv-driver.c:
+	* linux/drivers/media/video/saa7134/saa7134.h:
+	* linux/drivers/media/video/videodev.c: (video_release),
+	(video_register_device):
+	* linux/include/media/tuner.h:
+
+	- kernel-sync patches.
+
+	* linux/include/linux/videodev.h:
+	- Removes obsolete stuff from videodev.h
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-12-07 12:28  mchehab
 
 	* linux/drivers/media/video/saa7134/Makefile:
@@ -15,7 +30,7 @@
 	(v4l_compat_translate_ioctl):
 	* linux/sound/pci/bt87x.c: (snd_bt87x_create):
 
-	kernel-sync patches.
+	- kernel-sync patches.
 
 	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
 
@@ -42,7 +57,7 @@
 	* linux/drivers/media/video/saa7115.c:
 	* linux/drivers/media/video/saa7127.c:
 
-	kernel-sync patches.
+	- kernel-sync patches.
 
 	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
 
@@ -66,7 +81,7 @@
 	(put_v4l2_format32), (get_v4l2_standard32), (put_v4l2_standard32),
 	(get_v4l2_buffer32), (put_v4l2_buffer32), (put_v4l2_framebuffer32),
 	(do_video_ioctl):
-	This patch add 32-bit compatibility for v4l2 framegrabber ioctls.
+	- This patch add 32-bit compatibility for v4l2 framegrabber ioctls.
 
 	Signed-off-by: Philippe De Muyter <phdm@macqel.be>
 	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>