From: Geert Uytterhoeven <geert@linux-m68k.org>
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>
---
25-akpm/drivers/isdn/hisax/avm_pci.c | 4 +++-
25-akpm/drivers/isdn/hisax/config.c | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff -puN drivers/isdn/hisax/avm_pci.c~pci-warnings-hisax-isdn drivers/isdn/hisax/avm_pci.c
--- 25/drivers/isdn/hisax/avm_pci.c~pci-warnings-hisax-isdn 2004-07-26 17:27:38.461886464 -0700
+++ 25-akpm/drivers/isdn/hisax/avm_pci.c 2004-07-26 17:27:38.467885552 -0700
@@ -729,7 +729,9 @@ AVM_card_msg(struct IsdnCardState *cs, i
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
@@ -789,7 +791,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;
diff -puN drivers/isdn/hisax/config.c~pci-warnings-hisax-isdn drivers/isdn/hisax/config.c
--- 25/drivers/isdn/hisax/config.c~pci-warnings-hisax-isdn 2004-07-26 17:27:38.463886160 -0700
+++ 25-akpm/drivers/isdn/hisax/config.c 2004-07-26 17:27:38.469885248 -0700
@@ -1878,6 +1878,7 @@ static void EChannel_proc_rcv(struct his
}
}
+#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_tb
};
MODULE_DEVICE_TABLE(pci, hisax_pci_tbl);
+#endif /* CONFIG_PCI */
module_init(HiSax_init);
module_exit(HiSax_exit);
_