Merge Perforce changeset 219952 to head:

  Make different bus attachments for Altera and Terasice
  device drivers share the same devclass_t.

Sponsored by:	DARPA, AFRL

4 files changed, 3 insertions, 4 deletions

diff --git a/sys/dev/altera/sdcard/altera_sdcard.c b/sys/dev/altera/sdcard/altera_sdcard.c
index 4572206..f64b9c5 100644
--- a/sys/dev/altera/sdcard/altera_sdcard.c
+++ b/sys/dev/altera/sdcard/altera_sdcard.c
@@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$");
  * 3. Handle read-only SD Cards.
  * 4. Tune timeouts based on real-world SD Card speeds.
  */
+devclass_t	altera_sdcard_devclass;
 
 void
 altera_sdcard_attach(struct altera_sdcard_softc *sc)
diff --git a/sys/dev/altera/sdcard/altera_sdcard.h b/sys/dev/altera/sdcard/altera_sdcard.h
index 4a491c4..a0029a8 100644
--- a/sys/dev/altera/sdcard/altera_sdcard.h
+++ b/sys/dev/altera/sdcard/altera_sdcard.h
@@ -244,4 +244,6 @@ void	altera_sdcard_start(struct altera_sdcard_softc *sc);
 void	altera_sdcard_disk_insert(struct altera_sdcard_softc *sc);
 void	altera_sdcard_disk_remove(struct altera_sdcard_softc *sc);
 
+extern devclass_t	altera_sdcard_devclass;
+
 #endif	/* _DEV_ALTERA_SDCARD_H_ */
diff --git a/sys/dev/altera/sdcard/altera_sdcard_fdt.c b/sys/dev/altera/sdcard/altera_sdcard_fdt.c
index ca7be1c..027ca2d 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_fdt.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_fdt.c
@@ -116,7 +116,5 @@ static driver_t altera_sdcard_fdt_driver = {
 	sizeof(struct altera_sdcard_softc),
 };
 
-static devclass_t altera_sdcard_devclass;
-
 DRIVER_MODULE(altera_sdcard, simplebus, altera_sdcard_fdt_driver,
     altera_sdcard_devclass, 0, 0);
diff --git a/sys/dev/altera/sdcard/altera_sdcard_nexus.c b/sys/dev/altera/sdcard/altera_sdcard_nexus.c
index e0fddcb..88abe1f 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_nexus.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_nexus.c
@@ -110,7 +110,5 @@ static driver_t altera_sdcard_nexus_driver = {
 	sizeof(struct altera_sdcard_softc),
 };
 
-static devclass_t altera_sdcard_devclass;
-
 DRIVER_MODULE(altera_sdcard, nexus, altera_sdcard_nexus_driver,
     altera_sdcard_devclass, 0, 0);