diff options
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r-- | linux/drivers/media/dvb/b2c2/flexcop-pci.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/dvb/b2c2/flexcop-usb.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/dvb/bt8xx/bt878.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/dvb/cinergyT2/cinergyT2.c | 8 | ||||
-rw-r--r-- | linux/drivers/media/dvb/dvb-usb/usb-urb.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/dvb/pluto2/pluto2.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 8 |
8 files changed, 40 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-pci.c b/linux/drivers/media/dvb/b2c2/flexcop-pci.c index eb2e6432c..e6362f304 100644 --- a/linux/drivers/media/dvb/b2c2/flexcop-pci.c +++ b/linux/drivers/media/dvb/b2c2/flexcop-pci.c @@ -122,7 +122,11 @@ static void flexcop_pci_irq_check_work(void *data) /* When PID filtering is turned on, we use the timer IRQ, because small amounts * of data need to be passed to the user space instantly as well. When PID * filtering is turned off, we use the page-change-IRQ */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static irqreturn_t flexcop_pci_isr(int irq, void *dev_id, struct pt_regs *regs) +#else +static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) +#endif { struct flexcop_pci *fc_pci = dev_id; struct flexcop_device *fc = fc_pci->fc_dev; diff --git a/linux/drivers/media/dvb/b2c2/flexcop-usb.c b/linux/drivers/media/dvb/b2c2/flexcop-usb.c index 8a3ae27f8..8d16d6e72 100644 --- a/linux/drivers/media/dvb/b2c2/flexcop-usb.c +++ b/linux/drivers/media/dvb/b2c2/flexcop-usb.c @@ -328,7 +328,11 @@ static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, u8 *buffer, in fc_usb->tmp_buffer_length = l; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static void flexcop_usb_urb_complete(struct urb *urb, struct pt_regs *ptregs) +#else +static void flexcop_usb_urb_complete(struct urb *urb) +#endif { struct flexcop_usb *fc_usb = urb->context; int i; diff --git a/linux/drivers/media/dvb/bt8xx/bt878.c b/linux/drivers/media/dvb/bt8xx/bt878.c index 755822ee6..c63314b9f 100644 --- a/linux/drivers/media/dvb/bt8xx/bt878.c +++ b/linux/drivers/media/dvb/bt8xx/bt878.c @@ -266,7 +266,11 @@ EXPORT_SYMBOL(bt878_stop); /* Interrupt service routine */ /*****************************/ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static irqreturn_t bt878_irq(int irq, void *dev_id, struct pt_regs *regs) +#else +static irqreturn_t bt878_irq(int irq, void *dev_id) +#endif { u32 stat, astat, mask; int count; diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index 5964b27f9..90672efea 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -255,7 +255,11 @@ static void cinergyt2_sleep (struct cinergyt2 *cinergyt2, int sleep) cinergyt2->sleeping = sleep; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static void cinergyt2_stream_irq (struct urb *urb, struct pt_regs *regs); +#else +static void cinergyt2_stream_irq (struct urb *urb); +#endif static int cinergyt2_submit_stream_urb (struct cinergyt2 *cinergyt2, struct urb *urb) { @@ -275,7 +279,11 @@ static int cinergyt2_submit_stream_urb (struct cinergyt2 *cinergyt2, struct urb return err; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static void cinergyt2_stream_irq (struct urb *urb, struct pt_regs *regs) +#else +static void cinergyt2_stream_irq (struct urb *urb) +#endif { struct cinergyt2 *cinergyt2 = urb->context; diff --git a/linux/drivers/media/dvb/dvb-usb/usb-urb.c b/linux/drivers/media/dvb/dvb-usb/usb-urb.c index 572b2d9aa..2ed0a214b 100644 --- a/linux/drivers/media/dvb/dvb-usb/usb-urb.c +++ b/linux/drivers/media/dvb/dvb-usb/usb-urb.c @@ -11,7 +11,11 @@ #include "dvb-usb-common.h" /* URB stuff for streaming */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static void usb_urb_complete(struct urb *urb, struct pt_regs *ptregs) +#else +static void usb_urb_complete(struct urb *urb) +#endif { struct usb_data_stream *stream = urb->context; int ptype = usb_pipetype(urb->pipe); diff --git a/linux/drivers/media/dvb/pluto2/pluto2.c b/linux/drivers/media/dvb/pluto2/pluto2.c index 2310b2bfe..3de55e0cc 100644 --- a/linux/drivers/media/dvb/pluto2/pluto2.c +++ b/linux/drivers/media/dvb/pluto2/pluto2.c @@ -306,7 +306,11 @@ static void pluto_dma_end(struct pluto *pluto, unsigned int nbpackets) TS_DMA_BYTES, PCI_DMA_FROMDEVICE); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static irqreturn_t pluto_irq(int irq, void *dev_id, struct pt_regs *regs) +#else +static irqreturn_t pluto_irq(int irq, void *dev_id) +#endif { struct pluto *pluto = dev_id; u32 tscr; diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index af3391314..239a48bcb 100644 --- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c @@ -740,7 +740,11 @@ static void ttusb_process_frame(struct ttusb *ttusb, u8 * data, int len) } } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static void ttusb_iso_irq(struct urb *urb, struct pt_regs *ptregs) +#else +static void ttusb_iso_irq(struct urb *urb) +#endif { struct ttusb *ttusb = urb->context; diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index 36dd35db4..f2d18a5fb 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -214,7 +214,11 @@ static u16 rc_keys[] = { static void ttusb_dec_set_model(struct ttusb_dec *dec, enum ttusb_dec_model model); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static void ttusb_dec_handle_irq( struct urb *urb, struct pt_regs *regs) +#else +static void ttusb_dec_handle_irq( struct urb *urb) +#endif { struct ttusb_dec * dec = urb->context; char *buffer = dec->irq_buffer; @@ -766,7 +770,11 @@ static void ttusb_dec_process_urb_frame_list(unsigned long data) } } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static void ttusb_dec_process_urb(struct urb *urb, struct pt_regs *ptregs) +#else +static void ttusb_dec_process_urb(struct urb *urb) +#endif { struct ttusb_dec *dec = urb->context; |