[CVS] v4l2 generic.c,1.20,1.21

[Receive n. of C. c. <gat...@li...>]

Update of /cvsroot/gatos/v4l2
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5045

Modified Files:
	generic.c 
Log Message:

forgot to commit this, 
updated for irq handler interface changed in 2.6.20


Index: generic.c
===================================================================
RCS file: /cvsroot/gatos/v4l2/generic.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- generic.c	21 Oct 2006 12:27:15 -0000	1.20
+++ generic.c	9 Jun 2007 12:08:24 -0000	1.21
@@ -276,11 +276,13 @@
 /* defaults for setting up a cards video4linux capture device */
 static struct video_device generic_video_template =
 {
-        name:     "UNSET",
+        owner:     THIS_MODULE,
+        name:      "UNSET",
         type:      VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_OVERLAY|
                    VID_TYPE_CLIPPING|VID_TYPE_SCALES,
         hardware:  VID_HARDWARE_BT848, /* look in videodev.h for a list NONE IN THERE FOR bt829 */
         fops:      &generic_fops, /* file operations table above */
+	release:   video_device_release, 
         minor:     -1,
 };
 
@@ -2909,7 +2911,11 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 void generic_irq_handler(int irq, void *dev_id, struct pt_regs * regs)
 #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
 static irqreturn_t generic_irq_handler(int irq, void *dev_id, struct pt_regs * regs)
+#else 
+static irqreturn_t generic_irq_handler(int irq, void *dev_id)
+#endif
 #endif
 {
   GENERIC_CARD *card = (GENERIC_CARD *)dev_id;