summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18/cx18-mailbox.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-28 19:24:32 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-28 19:24:32 -0300
commitb89992af37003880352126bda1bb2b60cac85b5d (patch)
tree6b4571618b57833b9c7097bc7ec15b97c2f24b1b /linux/drivers/media/video/cx18/cx18-mailbox.h
parenta129f886d7e7b8e23e339f6ab8065cbf19a7c7cc (diff)
parentb9c9223867f6cc234603d878addfbe6526fba480 (diff)
downloadmediapointer-dvb-s2-b89992af37003880352126bda1bb2b60cac85b5d.tar.gz
mediapointer-dvb-s2-b89992af37003880352126bda1bb2b60cac85b5d.tar.bz2
merge: http://linuxtv.org/hg/~awalls/cx18-perf
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-mailbox.h')
-rw-r--r--linux/drivers/media/video/cx18/cx18-mailbox.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-mailbox.h b/linux/drivers/media/video/cx18/cx18-mailbox.h
index a667f1ae4..4bd0ba57f 100644
--- a/linux/drivers/media/video/cx18/cx18-mailbox.h
+++ b/linux/drivers/media/video/cx18/cx18-mailbox.h
@@ -96,9 +96,9 @@ int cx18_api_func(void *priv, u32 cmd, int in, int out,
void cx18_api_epu_cmd_irq(struct cx18 *cx, int rpu);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-void cx18_epu_work_handler(struct work_struct *work);
+void cx18_in_work_handler(struct work_struct *work);
#else
-void cx18_epu_work_handler(void *arg);
+void cx18_in_work_handler(void *arg);
#endif
#endif