diff options
Diffstat (limited to 'linux/drivers/media/video/zoran_device.c')
| -rw-r--r-- | linux/drivers/media/video/zoran_device.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zoran_device.c b/linux/drivers/media/video/zoran_device.c index 57fd910f2..72d1e5f14 100644 --- a/linux/drivers/media/video/zoran_device.c +++ b/linux/drivers/media/video/zoran_device.c @@ -1409,15 +1409,19 @@ error_handler (struct zoran *zr, irqreturn_t zoran_irq (int irq, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) void *dev_id, struct pt_regs *regs) +#else + void *dev_id) +#endif { u32 stat, astat; int count; struct zoran *zr; unsigned long flags; - zr = (struct zoran *) dev_id; + zr = dev_id; count = 0; if (zr->testing) { |