diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-13 13:49:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-13 13:49:04 -0300 |
| commit | a73981e95b53d62cc7e42ce54e54473f3758d2e7 (patch) | |
| tree | 94a39a23ddd291bb3ba1897bf72e69a532cff60e /linux/drivers/media/video/ivtv/ivtv-yuv.h | |
| parent | ed98e2514b5928698127958acf047de216986cb9 (diff) | |
| parent | 619f7ef871542e60ea54401cb52dda1b6679cfb9 (diff) | |
| download | mediapointer-dvb-s2-a73981e95b53d62cc7e42ce54e54473f3758d2e7.tar.gz mediapointer-dvb-s2-a73981e95b53d62cc7e42ce54e54473f3758d2e7.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/m920x
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.h')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-yuv.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-yuv.h b/linux/drivers/media/video/ivtv/ivtv-yuv.h index 74c56da6d..88972d3f7 100644 --- a/linux/drivers/media/video/ivtv/ivtv-yuv.h +++ b/linux/drivers/media/video/ivtv/ivtv-yuv.h @@ -21,8 +21,4 @@ int ivtv_yuv_filter_check(struct ivtv *itv); int ivtv_yuv_prep_frame(struct ivtv *itv, struct ivtv_dma_frame *args); void ivtv_yuv_close(struct ivtv *itv); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) -void ivtv_yuv_work_handler (struct work_struct *work); -#else -void ivtv_yuv_work_handler (void *arg); -#endif +void ivtv_yuv_work_handler (struct ivtv *itv); |