Move pcic_override_irq from pcic_isa, to pcic.

3 files changed, 8 insertions, 9 deletions

diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index b69f0e9..14b444a 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.c
@@ -81,6 +81,13 @@ static struct slot_ctrl pcic_cinfo = {
 /* sysctl vars */
 SYSCTL_NODE(_hw, OID_AUTO, pcic, CTLFLAG_RD, 0, "PCIC parameters");
 
+int pcic_override_irq = 0;
+TUNABLE_INT("machdep.pccard.pcic_irq", &pcic_override_irq);
+TUNABLE_INT("hw.pcic.irq", &pcic_override_irq);
+SYSCTL_INT(_hw_pcic, OID_AUTO, override_irq, CTLFLAG_RD,
+    &pcic_override_irq, 0,
+    "Override the IRQ configured by the config system for all pcic devices");
+
 /*
  * Read a register from the PCIC.
  */
diff --git a/sys/pccard/pcic_isa.c b/sys/pccard/pcic_isa.c
index 5473d89..860d800 100644
--- a/sys/pccard/pcic_isa.c
+++ b/sys/pccard/pcic_isa.c
@@ -79,15 +79,6 @@ static driver_intr_t	pcicintr;
 static int		pcicintr1(void *);
 static timeout_t 	pcictimeout;
 
-static int pcic_override_irq = 0;
-TUNABLE_INT("machdep.pccard.pcic_irq", &pcic_override_irq);
-TUNABLE_INT("hw.pcic.irq", &pcic_override_irq);
-SYSCTL_DECL(_hw_pcic);
-SYSCTL_INT(_hw_pcic, OID_AUTO, override_irq, CTLFLAG_RD,
-    &pcic_override_irq, 0,
-    "Override the IRQ configured by the config system for all pcic devices");
-
-
 /*
  *	Look for an Intel PCIC (or compatible).
  *	For each available slot, allocate a PC-CARD slot.
diff --git a/sys/pccard/pcicvar.h b/sys/pccard/pcicvar.h
index 75481b5..2369565 100644
--- a/sys/pccard/pcicvar.h
+++ b/sys/pccard/pcicvar.h
@@ -73,6 +73,7 @@ struct pcic_softc
 };
 
 extern devclass_t	pcic_devclass;
+extern int		pcic_override_irq;
 
 int pcic_activate_resource(device_t dev, device_t child, int type, int rid,
     struct resource *r);