git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
enternow_pci.c
diff --git
a/drivers/isdn/hisax/enternow_pci.c
b/drivers/isdn/hisax/enternow_pci.c
index
3341cf1
..
b45de9d
100644
(file)
--- a/
drivers/isdn/hisax/enternow_pci.c
+++ b/
drivers/isdn/hisax/enternow_pci.c
@@
-60,7
+60,6
@@
*/
*/
-#include <linux/config.h>
#include "hisax.h"
#include "isac.h"
#include "isdnl1.h"
#include "hisax.h"
#include "isac.h"
#include "isdnl1.h"
@@
-241,7
+240,7
@@
enpci_card_msg(struct IsdnCardState *cs, int mt, void *arg)
}
static irqreturn_t
}
static irqreturn_t
-enpci_interrupt(int intno, void *dev_id
, struct pt_regs *regs
)
+enpci_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
unsigned char s0val, s1val, ir;
{
struct IsdnCardState *cs = dev_id;
unsigned char s0val, s1val, ir;
@@
-302,10
+301,10
@@
enpci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
}
}
-static struct pci_dev *dev_netjet __initdata = NULL;
+static struct pci_dev *dev_netjet __
dev
initdata = NULL;
/* called by config.c */
/* called by config.c */
-int __init
+int __
dev
init
setup_enternow_pci(struct IsdnCard *card)
{
int bytecnt;
setup_enternow_pci(struct IsdnCard *card)
{
int bytecnt;
@@
-406,7
+405,7
@@
setup_enternow_pci(struct IsdnCard *card)
cs->BC_Send_Data = &netjet_fill_dma;
cs->cardmsg = &enpci_card_msg;
cs->irq_func = &enpci_interrupt;
cs->BC_Send_Data = &netjet_fill_dma;
cs->cardmsg = &enpci_card_msg;
cs->irq_func = &enpci_interrupt;
- cs->irq_flags |=
SA_SHIRQ
;
+ cs->irq_flags |=
IRQF_SHARED
;
return (1);
}
return (1);
}