4 files changed, 8 insertions, 8 deletions

diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index ac05a381aa5a..7988d0f86151 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -82,6 +82,8 @@ static int exintr_count = 0;
 # define DODEBUG(level, action)
 #endif
 
+devclass_t ex_devclass;
+
 char irq2eemap[] =
 	{ -1, -1, 0, 1, -1, 2, -1, -1, -1, 0, 3, 4, -1, -1, -1, -1 };
 u_char ee2irqmap[] =
diff --git a/sys/dev/ex/if_ex_isa.c b/sys/dev/ex/if_ex_isa.c
index 13d9d9be3c48..b5d9681fb034 100644
--- a/sys/dev/ex/if_ex_isa.c
+++ b/sys/dev/ex/if_ex_isa.c
@@ -60,7 +60,7 @@ static	void	ex_pnp_wakeup	(void *);
 SYSINIT(ex_pnpwakeup, SI_SUB_CPU, SI_ORDER_ANY, ex_pnp_wakeup, NULL);
 #endif
 
-static device_method_t ex_methods[] = {
+static device_method_t ex_isa_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_identify,	ex_isa_identify),
 	DEVMETHOD(device_probe,		ex_isa_probe),
@@ -70,15 +70,13 @@ static device_method_t ex_methods[] = {
 	{ 0, 0 }
 };
 
-static driver_t ex_driver = {
+static driver_t ex_isa_driver = {
 	"ex",
-	ex_methods,
+	ex_isa_methods,
 	sizeof(struct ex_softc),
 };
 
-devclass_t ex_devclass;
-
-DRIVER_MODULE(ex, isa, ex_driver, ex_devclass, 0, 0);
+DRIVER_MODULE(ex, isa, ex_isa_driver, ex_devclass, 0, 0);
 
 static struct isa_pnp_id ex_ids[] = {
 	{ 0x3110d425,	NULL },	/* INT1031 */
diff --git a/sys/dev/ex/if_ex_pccard.c b/sys/dev/ex/if_ex_pccard.c
index 7087cf52bacc..ca876e6b22b1 100644
--- a/sys/dev/ex/if_ex_pccard.c
+++ b/sys/dev/ex/if_ex_pccard.c
@@ -67,8 +67,6 @@ static driver_t ex_pccard_driver = {
 	sizeof(struct ex_softc),
 };
 
-extern devclass_t ex_devclass;
-
 DRIVER_MODULE(ex, pccard, ex_pccard_driver, ex_devclass, 0, 0);
 
 static int
diff --git a/sys/dev/ex/if_exvar.h b/sys/dev/ex/if_exvar.h
index 6539b85c98dc..2f94c4112864 100644
--- a/sys/dev/ex/if_exvar.h
+++ b/sys/dev/ex/if_exvar.h
@@ -67,6 +67,8 @@ struct ex_softc {
 					/* frame in the chain.		*/
 };
 
+extern devclass_t ex_devclass;
+
 extern char	irq2eemap[];
 extern u_char	ee2irqmap[];
 extern char	plus_irq2eemap[];