git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
drivers
/
isdn
/
hisax
/
enternow_pci.c
diff --git
a/drivers/isdn/hisax/enternow_pci.c
b/drivers/isdn/hisax/enternow_pci.c
index
8fcbe2e
..
76c7d29
100644
(file)
--- 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)
}
-static struct pci_dev *dev_netjet __initdata = NULL;
+static struct pci_dev *dev_netjet __
dev
initdata = NULL;
/* called by config.c */
-int __init
+int __
dev
init
setup_enternow_pci(struct IsdnCard *card)
{
int bytecnt;