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
/
nj_s.c
diff --git
a/drivers/isdn/hisax/nj_s.c
b/drivers/isdn/hisax/nj_s.c
index
8b5822c
..
c09ffb1
100644
(file)
--- a/
drivers/isdn/hisax/nj_s.c
+++ b/
drivers/isdn/hisax/nj_s.c
@@
-5,7
+5,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
@@
-15,7
+14,7
@@
#include <linux/ppp_defs.h>
#include "netjet.h"
#include <linux/ppp_defs.h>
#include "netjet.h"
-const char *NETjet_S_revision = "$Revision: 2.13.2.4 $";
+
static
const char *NETjet_S_revision = "$Revision: 2.13.2.4 $";
static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off)
{
static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off)
{
@@
-27,7
+26,7
@@
static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value
}
static irqreturn_t
}
static irqreturn_t
-netjet_s_interrupt(int intno, void *dev_id
, struct pt_regs *regs
)
+netjet_s_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val, s1val, s0val;
{
struct IsdnCardState *cs = dev_id;
u_char val, s1val, s0val;
@@
-149,9
+148,9
@@
NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return(0);
}
return(0);
}
-static struct pci_dev *dev_netjet __initdata = NULL;
+static struct pci_dev *dev_netjet __
dev
initdata = NULL;
-int __init
+int __
dev
init
setup_netjet_s(struct IsdnCard *card)
{
int bytecnt,cfg;
setup_netjet_s(struct IsdnCard *card)
{
int bytecnt,cfg;
@@
-167,7
+166,7
@@
setup_netjet_s(struct IsdnCard *card)
return(0);
test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);
return(0);
test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);
-#if CONFIG_PCI
+#if
def
CONFIG_PCI
for ( ;; )
{
for ( ;; )
{
@@
-272,7
+271,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 |=
SA_SHIRQ
;
+ cs->irq_flags |=
IRQF_SHARED
;
ISACVersion(cs, "NETjet-S:");
return (1);
}
ISACVersion(cs, "NETjet-S:");
return (1);
}