diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /drivers/isdn/hisax/nj_s.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/isdn/hisax/nj_s.c')
| -rw-r--r-- | drivers/isdn/hisax/nj_s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index e5b900a6fa0..80025fd890f 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c @@ -148,9 +148,9 @@ NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg) return(0); } -static struct pci_dev *dev_netjet __initdata = NULL; +static struct pci_dev *dev_netjet __devinitdata = NULL; -int __init +int __devinit setup_netjet_s(struct IsdnCard *card) { int bytecnt,cfg; |