* [PATCH] Elsa ISDN: Kill warnings if !PCI
@ 2004-10-24 11:14 Geert Uytterhoeven
0 siblings, 0 replies; only message in thread
From: Geert Uytterhoeven @ 2004-10-24 11:14 UTC (permalink / raw)
To: Karsten Keil; +Cc: Linux Kernel Development, isdn4linux
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@linux-m68k.org
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-10-24 11:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-10-24 11:14 [PATCH] Elsa ISDN: Kill warnings if !PCI Geert Uytterhoeven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®