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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
avm_pci.c
diff --git
a/drivers/isdn/hisax/avm_pci.c
b/drivers/isdn/hisax/avm_pci.c
index
d7ba32f
..
235f28a
100644
(file)
--- a/
drivers/isdn/hisax/avm_pci.c
+++ b/
drivers/isdn/hisax/avm_pci.c
@@
-729,7
+729,9
@@
AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return(0);
}
return(0);
}
+#ifdef CONFIG_PCI
static struct pci_dev *dev_avm __initdata = NULL;
static struct pci_dev *dev_avm __initdata = NULL;
+#endif
#ifdef __ISAPNP__
static struct pnp_card *pnp_avm_c __initdata = NULL;
#endif
#ifdef __ISAPNP__
static struct pnp_card *pnp_avm_c __initdata = NULL;
#endif
@@
-788,7
+790,7
@@
setup_avm_pcipnp(struct IsdnCard *card)
printk(KERN_INFO "FritzPnP: no ISA PnP present\n");
}
#endif
printk(KERN_INFO "FritzPnP: no ISA PnP present\n");
}
#endif
-#if CONFIG_PCI
+#if
def
CONFIG_PCI
if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM,
PCI_DEVICE_ID_AVM_A1, dev_avm))) {
cs->irq = dev_avm->irq;
if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM,
PCI_DEVICE_ID_AVM_A1, dev_avm))) {
cs->irq = dev_avm->irq;