[linux-dvb] dvb-kernel CVS and 2.6.0-test5 patches

[Oskar Signell <oskar@signell.net>]

Hello list

The latest dvb-kernel CVS needed some patching to compile with kernel
version 2.6.0-test5. The following patch did the trick for me.



-- 
Oskar Signell <oskar@signell.net>
--- dvb-kernel/linux/drivers/media/common/saa7146_i2c.c.orig  2003-09-11 14:52:36.000000000 +0300
+++ dvb-kernel/linux/drivers/media/common/saa7146_i2c.c       2003-09-11 16:10:13.000000000 +0300
@@ -411,7 +411,7 @@
                strcpy(i2c_adapter->name, dev->name);
                i2c_adapter->data = dev;
 #else
-               strcpy(i2c_adapter->dev.name, dev->name);
+               strcpy(i2c_adapter->name, dev->name);
                i2c_set_adapdata(i2c_adapter,dev);
 #endif
                i2c_adapter->algo          = &saa7146_algo;


-- dvb-kernel/linux/drivers/media/common/saa7146_fops.c.orig 2003-09-11 15:26:07.000000000 +0300
+++ dvb-kernel/linux/drivers/media/common/saa7146_fops.c      2003-09-11 15:26:27.000000000 +0300
@@ -157,7 +157,7 @@

 static int fops_open(struct inode *inode, struct file *file)
 {
-       unsigned int minor = minor(inode->i_rdev);
+       unsigned int minor = iminor(inode);
        struct saa7146_dev *h = NULL, *dev = NULL;
        struct list_head *list;
        struct saa7146_fh *fh = NULL;


--- dvb-kernel/linux/drivers/media/common/video-buf.c.orig    2003-09-11 15:28:53.000000000 +0300
+++ dvb-kernel/linux/drivers/media/common/video-buf.c 2003-09-11 15:29:09.000000000 +0300
@@ -1085,7 +1085,7 @@
        page = alloc_page(GFP_USER);
        if (!page)
                return NOPAGE_OOM;
-       clear_user_page(page_address(page), vaddr); //, page);
+       clear_user_page(page_address(page), vaddr, page);
        return page;
 }