From 44588fb487e94e330e9ea9da744cb35e7f14dc96 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 16 Dec 2006 18:29:03 -0200 Subject: Several stuff backported from 2.6.19-git series From: Mauro Carvalho Chehab - INIT_WORK replaced by INIT_DELAYED_WORK - struct work_struct replaced by struct delayed_work - callback parameters also changed - SLAB_KERNEL replaced by GFP_KERNEL - linux/suspend.h replaced by linux/freezer.h - on cpia: INIT_WORK replaced by INIT_WORK_NAR - file->f_dentry->d_inode replaced by file->f_path.dentry->d_inode Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/zoran_procfs.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'linux/drivers/media/video/zoran_procfs.c') diff --git a/linux/drivers/media/video/zoran_procfs.c b/linux/drivers/media/video/zoran_procfs.c index c63752b54..77cbe49c3 100644 --- a/linux/drivers/media/video/zoran_procfs.c +++ b/linux/drivers/media/video/zoran_procfs.c @@ -145,7 +145,11 @@ static int zoran_open(struct inode *inode, struct file *file) static ssize_t zoran_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) struct zoran *zr = PDE(file->f_dentry->d_inode)->data; +#else + struct zoran *zr = PDE(file->f_path.dentry->d_inode)->data; +#endif char *string, *sp; char *line, *ldelim, *varname, *svar, *tdelim; @@ -166,7 +170,11 @@ static ssize_t zoran_write(struct file *file, const char __user *buffer, } string[count] = 0; dprintk(4, KERN_INFO "%s: write_proc: name=%s count=%zu zr=%p\n", +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) ZR_DEVNAME(zr), file->f_dentry->d_name.name, count, zr); +#else + ZR_DEVNAME(zr), file->f_path.dentry->d_name.name, count, zr); +#endif ldelim = " \t\n"; tdelim = "="; line = strpbrk(sp, ldelim); -- cgit v1.2.3