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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
nj_s.c
diff --git
a/drivers/isdn/hisax/nj_s.c
b/drivers/isdn/hisax/nj_s.c
index
80025fd
..
a7d3cd3
100644
(file)
--- a/
drivers/isdn/hisax/nj_s.c
+++ b/
drivers/isdn/hisax/nj_s.c
@@
-5,6
+5,7
@@
*
*/
*
*/
+#include <linux/config.h>
#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
@@
-148,9
+149,9
@@
NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return(0);
}
return(0);
}
-static struct pci_dev *dev_netjet __
dev
initdata = NULL;
+static struct pci_dev *dev_netjet __initdata = NULL;
-int __
dev
init
+int __init
setup_netjet_s(struct IsdnCard *card)
{
int bytecnt,cfg;
setup_netjet_s(struct IsdnCard *card)
{
int bytecnt,cfg;
@@
-271,7
+272,7
@@
setup_netjet_s(struct IsdnCard *card)
setup_isac(cs);
cs->cardmsg = &NETjet_S_card_msg;
cs->irq_func = &netjet_s_interrupt;
setup_isac(cs);
cs->cardmsg = &NETjet_S_card_msg;
cs->irq_func = &netjet_s_interrupt;
- cs->irq_flags |=
IRQF_SHARED
;
+ cs->irq_flags |=
SA_SHIRQ
;
ISACVersion(cs, "NETjet-S:");
return (1);
}
ISACVersion(cs, "NETjet-S:");
return (1);
}