]> git.neil.brown.name Git - history.git/commitdiff
[PATCH] !PCI warnings: Hisax ISDN
authorGeert Uytterhoeven <geert@linux-m68k.org>
Wed, 28 Jul 2004 16:08:16 +0000 (09:08 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 28 Jul 2004 16:08:16 +0000 (09:08 -0700)
Kill warnings in Hisax ISDN drivers when !PCI.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/isdn/hisax/avm_pci.c
drivers/isdn/hisax/config.c

index d7ba32f3ddd27c06aa33a501a922a5f3f4a0398e..235f28a46551cea154f08cc3f3800a176f312545 100644 (file)
@@ -729,7 +729,9 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
        return(0);
 }
 
+#ifdef CONFIG_PCI
 static struct pci_dev *dev_avm __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
-#if CONFIG_PCI
+#ifdef CONFIG_PCI
                if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM,
                        PCI_DEVICE_ID_AVM_A1,  dev_avm))) {
                        cs->irq = dev_avm->irq;
index 7a2d65a911e77f94e589f061ccc2ad69019717f0..b920679e8eb277069a11b34a7f079141048770c4 100644 (file)
@@ -1878,6 +1878,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if)
        }
 }
 
+#ifdef CONFIG_PCI
 #include <linux/pci.h>
 
 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);
+#endif /* CONFIG_PCI */
 
 module_init(HiSax_init);
 module_exit(HiSax_exit);