From ee074dba8e79e5f405700ba7907b58572fbea8cb Mon Sep 17 00:00:00 2001 From: kpfleming Date: Mon, 11 Dec 2006 18:34:20 +0000 Subject: Merged revisions 1698 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.4 ................ r1698 | kpfleming | 2006-12-11 12:31:12 -0600 (Mon, 11 Dec 2006) | 10 lines Merged revisions 1697 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r1697 | kpfleming | 2006-12-11 12:27:15 -0600 (Mon, 11 Dec 2006) | 2 lines kernel 2.6.19 API changes compatibility ........ ................ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1699 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- pciradio.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pciradio.c') diff --git a/pciradio.c b/pciradio.c index c658f20..10ea7b2 100644 --- a/pciradio.c +++ b/pciradio.c @@ -713,11 +713,7 @@ static void pciradio_stop_dma(struct pciradio *rad); static void pciradio_reset_serial(struct pciradio *rad); static void pciradio_restart_dma(struct pciradio *rad); -#ifdef LINUX26 -static irqreturn_t pciradio_interrupt(int irq, void *dev_id, struct pt_regs *regs) -#else -static void pciradio_interrupt(int irq, void *dev_id, struct pt_regs *regs) -#endif +ZAP_IRQ_HANDLER(pciradio_interrupt) { struct pciradio *rad = dev_id; unsigned char ints,byte1,byte2,gotcor,gotctcss,gotslowctcss,ctcss; -- cgit v1.2.3