diff options
author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/isdn/hisax/enternow_pci.c | |
parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) |
Merge branch 'merge'
Diffstat (limited to 'drivers/isdn/hisax/enternow_pci.c')
-rw-r--r-- | drivers/isdn/hisax/enternow_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index 8fcbe2e7d765..76c7d29d1b2f 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c | |||
@@ -301,10 +301,10 @@ enpci_interrupt(int intno, void *dev_id, struct pt_regs *regs) | |||
301 | } | 301 | } |
302 | 302 | ||
303 | 303 | ||
304 | static struct pci_dev *dev_netjet __initdata = NULL; | 304 | static struct pci_dev *dev_netjet __devinitdata = NULL; |
305 | 305 | ||
306 | /* called by config.c */ | 306 | /* called by config.c */ |
307 | int __init | 307 | int __devinit |
308 | setup_enternow_pci(struct IsdnCard *card) | 308 | setup_enternow_pci(struct IsdnCard *card) |
309 | { | 309 | { |
310 | int bytecnt; | 310 | int bytecnt; |