diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-10 08:30:12 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-10 08:30:12 -0200 |
| commit | 17a569d12a5fe6b3ec8b1ece9615cd14921a602d (patch) | |
| tree | e4cf0f8dd66e00556698987726c4f39ec64585ca /linux/drivers/media/video/ivtv/ivtv-yuv.c | |
| parent | 14a5f0740789ad75bcb0ecc5c91cc92484cd54a8 (diff) | |
| parent | 3f8c2448bb82dd0b01be5d5f7d5d2de9962f83a8 (diff) | |
| download | mediapointer-dvb-s2-17a569d12a5fe6b3ec8b1ece9615cd14921a602d.tar.gz mediapointer-dvb-s2-17a569d12a5fe6b3ec8b1ece9615cd14921a602d.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-yuv.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-yuv.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-yuv.c b/linux/drivers/media/video/ivtv/ivtv-yuv.c index 04d93a753..286a0d7e7 100644 --- a/linux/drivers/media/video/ivtv/ivtv-yuv.c +++ b/linux/drivers/media/video/ivtv/ivtv-yuv.c @@ -22,6 +22,7 @@ #include "ivtv-queue.h" #include "ivtv-udma.h" #include "ivtv-irq.h" +#include "ivtv-yuv.h" static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma, struct ivtv_dma_frame *args) @@ -804,18 +805,8 @@ static u32 ivtv_yuv_window_setup (struct ivtv *itv, struct yuv_frame_info *windo } /* Update the scaling register to the requested value */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) -void ivtv_yuv_work_handler (struct work_struct *work) +void ivtv_yuv_work_handler (struct ivtv *itv) { - struct yuv_playback_info *info = container_of(work, struct yuv_playback_info, work_queue); - struct ivtv *itv = container_of(info, struct ivtv, yuv_info); -#else -void ivtv_yuv_work_handler (void *arg) -{ - struct ivtv *itv = arg; -#endif - DEFINE_WAIT(wait); - struct yuv_frame_info window; u32 yuv_update; |