aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-irq.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-12 11:53:43 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-12 11:53:43 +0100
commite18d7af85296cb6999aae171e8a9f8612bea5ae0 (patch)
tree97a675ecc17bef2f710c50f5ea2a480df0e362c0 /drivers/media/video/cx18/cx18-irq.h
parent3555105333ae55414d0fe051557bd7dc590f5255 (diff)
parent8b1fae4e4200388b64dd88065639413cb3f1051c (diff)
downloadlinux-e18d7af85296cb6999aae171e8a9f8612bea5ae0.tar.gz
Merge commit 'v2.6.28-rc8' into x86/mm
Diffstat (limited to 'drivers/media/video/cx18/cx18-irq.h')
-rw-r--r--drivers/media/video/cx18/cx18-irq.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-irq.h b/drivers/media/video/cx18/cx18-irq.h
index 379f704f5cba..6173ca3bc9e4 100644
--- a/drivers/media/video/cx18/cx18-irq.h
+++ b/drivers/media/video/cx18/cx18-irq.h
@@ -32,6 +32,4 @@
irqreturn_t cx18_irq_handler(int irq, void *dev_id);
-void cx18_irq_work_handler(struct work_struct *work);
-void cx18_dma_stream_dec_prepare(struct cx18_stream *s, u32 offset, int lock);
-void cx18_unfinished_dma(unsigned long arg);
+void cx18_work_handler(struct work_struct *work);