diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-16 18:29:03 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-16 18:29:03 -0200 |
| commit | 44588fb487e94e330e9ea9da744cb35e7f14dc96 (patch) | |
| tree | d1bcfa03e7ac8c5d1d327aca0023f43ed3f76651 /linux/drivers/media/video/video-buf-dvb.c | |
| parent | 35098755c90373eb932f02f71ec986e9d4a6f49b (diff) | |
| download | mediapointer-dvb-s2-44588fb487e94e330e9ea9da744cb35e7f14dc96.tar.gz mediapointer-dvb-s2-44588fb487e94e330e9ea9da744cb35e7f14dc96.tar.bz2 | |
Several stuff backported from 2.6.19-git series
From: Mauro Carvalho Chehab <mchehab@infradead.org>
- 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 <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/video-buf-dvb.c')
| -rw-r--r-- | linux/drivers/media/video/video-buf-dvb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c index b5e472c4d..86993f95a 100644 --- a/linux/drivers/media/video/video-buf-dvb.c +++ b/linux/drivers/media/video/video-buf-dvb.c @@ -22,7 +22,11 @@ #include <linux/fs.h> #include <linux/kthread.h> #include <linux/file.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) #include <linux/suspend.h> +#else +#include <linux/freezer.h> +#endif #include <media/video-buf.h> #include <media/video-buf-dvb.h> |