diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-17 16:18:30 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-17 16:18:30 +0200 |
| commit | b5125f57f3d64672a4bc21dfc38d9b589448238d (patch) | |
| tree | 16c7f1daf9b6410209c8c0a7a8171103185a2e1f /linux/drivers/media | |
| parent | 5dd5b667fb09167143e1c49dea40b696f7f3ad52 (diff) | |
| download | mediapointer-dvb-s2-b5125f57f3d64672a4bc21dfc38d9b589448238d.tar.gz mediapointer-dvb-s2-b5125f57f3d64672a4bc21dfc38d9b589448238d.tar.bz2 | |
cx18/smsusb: fix compile errors when building for kernels < 2.6.19
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/siano/smsusb.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-irq.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-irq.h | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/siano/smsusb.c b/linux/drivers/media/dvb/siano/smsusb.c index 079deb2a1..40582bf70 100644 --- a/linux/drivers/media/dvb/siano/smsusb.c +++ b/linux/drivers/media/dvb/siano/smsusb.c @@ -55,7 +55,7 @@ struct smsusb_device_t { static int smsusb_submit_urb(struct smsusb_device_t *dev, struct smsusb_urb_t *surb); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) static void smsusb_onresponse(struct urb *urb) #else static void smsusb_onresponse(struct urb *urb, struct pt_regs *regs) diff --git a/linux/drivers/media/video/cx18/cx18-irq.c b/linux/drivers/media/video/cx18/cx18-irq.c index 25114a5cb..654664783 100644 --- a/linux/drivers/media/video/cx18/cx18-irq.c +++ b/linux/drivers/media/video/cx18/cx18-irq.c @@ -132,7 +132,11 @@ static void hpu_cmd(struct cx18 *cx, u32 sw1) CX18_WARN("Unexpected interrupt %08x\n", sw1); } +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18) +irqreturn_t cx18_irq_handler(int irq, void *dev_id, struct pt_regs *regs) +#else irqreturn_t cx18_irq_handler(int irq, void *dev_id) +#endif { struct cx18 *cx = (struct cx18 *)dev_id; u32 sw1, sw1_mask; diff --git a/linux/drivers/media/video/cx18/cx18-irq.h b/linux/drivers/media/video/cx18/cx18-irq.h index 379f704f5..cbcd2022f 100644 --- a/linux/drivers/media/video/cx18/cx18-irq.h +++ b/linux/drivers/media/video/cx18/cx18-irq.h @@ -30,7 +30,11 @@ #define SW2_INT_STATUS 0xc73144 #define SW2_INT_ENABLE_PCI 0xc7315c +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18) +irqreturn_t cx18_irq_handler(int irq, void *dev_id, struct pt_regs *regs); +#else irqreturn_t cx18_irq_handler(int irq, void *dev_id); +#endif void cx18_irq_work_handler(struct work_struct *work); void cx18_dma_stream_dec_prepare(struct cx18_stream *s, u32 offset, int lock); |