[PATCH] Elsa ISDN: Kill warnings if !PCI

[Geert Uytterhoeven]

Elsa ISDN: Kill warnings if !PCI

I'm not 100% sure this is correct, though. Can setup_elsa() be called multiple
times? If yes, dev_qs[13]000 have to be static.

--- linux-2.6.10-rc1/drivers/isdn/hisax/elsa.c.orig	2004-10-23 10:33:02.000000000 +0200
+++ linux-2.6.10-rc1/drivers/isdn/hisax/elsa.c	2004-10-24 12:54:59.000000000 +0200
@@ -834,9 +834,6 @@ probe_elsa(struct IsdnCardState *cs)
 	return (CARD_portlist[i]);
 }
 
-static 	struct pci_dev *dev_qs1000 __devinitdata = NULL;
-static 	struct pci_dev *dev_qs3000 __devinitdata = NULL;
-
 #ifdef __ISAPNP__
 static struct isapnp_device_id elsa_ids[] __initdata = {
 	{ ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133),
@@ -1022,6 +1019,9 @@ setup_elsa(struct IsdnCard *card)
 		       cs->irq);
 	} else if (cs->typ == ISDN_CTYPE_ELSA_PCI) {
 #ifdef CONFIG_PCI
+		struct pci_dev *dev_qs1000 = NULL;
+		struct pci_dev *dev_qs3000 = NULL;
+
 		cs->subtyp = 0;
 		if ((dev_qs1000 = pci_find_device(PCI_VENDOR_ID_ELSA,
 			PCI_DEVICE_ID_ELSA_MICROLINK, dev_qs1000))) {
Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/