From 44588fb487e94e330e9ea9da744cb35e7f14dc96 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sat, 16 Dec 2006 18:29:03 -0200
Subject: 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>
---
 linux/drivers/media/video/tvaudio.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'linux/drivers/media/video/tvaudio.c')

diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c
index a551af799..e08484fd2 100644
--- a/linux/drivers/media/video/tvaudio.c
+++ b/linux/drivers/media/video/tvaudio.c
@@ -30,6 +30,9 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/kthread.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+#include <linux/freezer.h>
+#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #include "i2c-compat.h"
-- 
cgit v1.2.3