Commit 2b36733d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] !PCI warnings: Hisax ISDN

Kill warnings in Hisax ISDN drivers when !PCI.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 52ee50b2
...@@ -729,7 +729,9 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg) ...@@ -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__ #ifdef __ISAPNP__
static struct pnp_card *pnp_avm_c __initdata = NULL; static struct pnp_card *pnp_avm_c __initdata = NULL;
#endif #endif
...@@ -788,7 +790,7 @@ setup_avm_pcipnp(struct IsdnCard *card) ...@@ -788,7 +790,7 @@ setup_avm_pcipnp(struct IsdnCard *card)
printk(KERN_INFO "FritzPnP: no ISA PnP present\n"); printk(KERN_INFO "FritzPnP: no ISA PnP present\n");
} }
#endif #endif
#if CONFIG_PCI #ifdef CONFIG_PCI
if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM, if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM,
PCI_DEVICE_ID_AVM_A1, dev_avm))) { PCI_DEVICE_ID_AVM_A1, dev_avm))) {
cs->irq = dev_avm->irq; cs->irq = dev_avm->irq;
......
...@@ -1878,6 +1878,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if) ...@@ -1878,6 +1878,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if)
} }
} }
#ifdef CONFIG_PCI
#include <linux/pci.h> #include <linux/pci.h>
static struct pci_device_id hisax_pci_tbl[] __initdata = { static struct pci_device_id hisax_pci_tbl[] __initdata = {
...@@ -1946,6 +1947,7 @@ static struct pci_device_id hisax_pci_tbl[] __initdata = { ...@@ -1946,6 +1947,7 @@ static struct pci_device_id hisax_pci_tbl[] __initdata = {
}; };
MODULE_DEVICE_TABLE(pci, hisax_pci_tbl); MODULE_DEVICE_TABLE(pci, hisax_pci_tbl);
#endif /* CONFIG_PCI */
module_init(HiSax_init); module_init(HiSax_init);
module_exit(HiSax_exit); module_exit(HiSax_exit);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment