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 rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
isdn
/
hisax
/
telespci.c
diff --git
a/drivers/isdn/hisax/telespci.c
b/drivers/isdn/hisax/telespci.c
index
9382cdf
..
dca4468
100644
(file)
--- a/
drivers/isdn/hisax/telespci.c
+++ b/
drivers/isdn/hisax/telespci.c
@@
-284,9
+284,9
@@
TelesPCI_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return(0);
}
-static struct pci_dev *dev_tel __initdata = NULL;
+static struct pci_dev *dev_tel __
dev
initdata = NULL;
-int __init
+int __
dev
init
setup_telespci(struct IsdnCard *card)
{
struct IsdnCardState *cs = card->cs;