diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-23 16:54:56 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-23 16:54:56 -0200 |
commit | 2d65658078459d35572e637c8cb1b6fc3826f12a (patch) | |
tree | e18d3f1e0e68c693a727e429934e42af169a2853 /linux/drivers/media/video/video-buf-dvb.c | |
parent | b64c80be829fbeb8b936ca6d61a59013d8ad2bba (diff) | |
parent | cc88074b4da7cb25b8c2bc93f41434cfc1763924 (diff) | |
download | mediapointer-dvb-s2-2d65658078459d35572e637c8cb1b6fc3826f12a.tar.gz mediapointer-dvb-s2-2d65658078459d35572e637c8cb1b6fc3826f12a.tar.bz2 |
merge: http://linuxtv.org/hg/~mrechberger/v4l-dvb-cx88
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c index 86993f95a..4776364a6 100644 --- a/linux/drivers/media/video/video-buf-dvb.c +++ b/linux/drivers/media/video/video-buf-dvb.c @@ -13,7 +13,6 @@ * (at your option) any later version. */ -#include "compat.h" #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) #include <linux/module.h> @@ -30,6 +29,7 @@ #include <media/video-buf.h> #include <media/video-buf-dvb.h> +#include "compat.h" /* ------------------------------------------------------------------ */ @@ -68,13 +68,7 @@ static int videobuf_dvb_thread(void *data) break; if (kthread_should_stop()) break; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13) try_to_freeze(); -#else - if (current->flags & PF_FREEZE) { - refrigerator (PF_FREEZE); - } -#endif /* feed buffer data to demux */ if (buf->state == STATE_DONE) |