svn commit: r202224 - in stable/7/sys: dev/auxio sparc64/central sparc64/fhc sparc64/pci sparc64/sbus sparc64/sparc64

[Marius Strobl]

Author: marius
Date: Wed Jan 13 19:59:19 2010
New Revision: 202224
URL: http://svn.freebsd.org/changeset/base/202224

Log:
  MFC: r200815, r200816
  
  Provide and consume missing module dependency information.

Modified:
  stable/7/sys/dev/auxio/auxio.c
  stable/7/sys/sparc64/central/central.c
  stable/7/sys/sparc64/fhc/fhc.c
  stable/7/sys/sparc64/pci/apb.c
  stable/7/sys/sparc64/pci/ofw_pcib.c
  stable/7/sys/sparc64/sbus/sbus.c
  stable/7/sys/sparc64/sparc64/nexus.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/auxio/auxio.c
==============================================================================
--- stable/7/sys/dev/auxio/auxio.c	Wed Jan 13 19:59:13 2010	(r202223)
+++ stable/7/sys/dev/auxio/auxio.c	Wed Jan 13 19:59:19 2010	(r202224)
@@ -56,7 +56,7 @@
  */
 
 /*
- * AUXIO registers support on the sbus & ebus2, used for the floppy driver
+ * AUXIO registers support on the SBus & EBus2, used for the floppy driver
  * and to control the system LED, for the BLINK option.
  */
 
@@ -85,8 +85,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/auxio/auxioreg.h>
 
 /*
- * on sun4u, auxio exists with one register (LED) on the sbus, and 5
- * registers on the ebus2 (pci) (LED, PCIMODE, FREQUENCY, SCSI
+ * On sun4u, auxio exists with one register (LED) on the SBus, and 5
+ * registers on the EBus2 (pci) (LED, PCIMODE, FREQUENCY, SCSI
  * OSCILLATOR, and TEMP SENSE.
  */
 
@@ -142,6 +142,7 @@ static driver_t auxio_sbus_driver = {
 
 static devclass_t	auxio_devclass;
 DRIVER_MODULE(auxio, sbus, auxio_sbus_driver, auxio_devclass, 0, 0);
+MODULE_DEPEND(auxio, sbus, 1, 1, 1);
 
 /* EBus */
 static device_method_t auxio_ebus_methods[] = {
@@ -158,6 +159,7 @@ static driver_t auxio_ebus_driver = {
 };
 
 DRIVER_MODULE(auxio, ebus, auxio_ebus_driver, auxio_devclass, 0, 0);
+MODULE_DEPEND(auxio, ebus, 1, 1, 1);
 MODULE_VERSION(auxio, 1);
 
 #define AUXIO_LOCK_INIT(sc)	\

Modified: stable/7/sys/sparc64/central/central.c
==============================================================================
--- stable/7/sys/sparc64/central/central.c	Wed Jan 13 19:59:13 2010	(r202223)
+++ stable/7/sys/sparc64/central/central.c	Wed Jan 13 19:59:19 2010	(r202224)
@@ -105,6 +105,7 @@ static driver_t central_driver = {
 static devclass_t central_devclass;
 
 DRIVER_MODULE(central, nexus, central_driver, central_devclass, 0, 0);
+MODULE_DEPEND(fhc, nexus, 1, 1, 1);
 MODULE_VERSION(central, 1);
 
 static int

Modified: stable/7/sys/sparc64/fhc/fhc.c
==============================================================================
--- stable/7/sys/sparc64/fhc/fhc.c	Wed Jan 13 19:59:13 2010	(r202223)
+++ stable/7/sys/sparc64/fhc/fhc.c	Wed Jan 13 19:59:19 2010	(r202224)
@@ -119,8 +119,9 @@ static driver_t fhc_driver = {
 static devclass_t fhc_devclass;
 
 DRIVER_MODULE(fhc, central, fhc_driver, fhc_devclass, 0, 0);
-DRIVER_MODULE(fhc, nexus, fhc_driver, fhc_devclass, 0, 0);
 MODULE_DEPEND(fhc, central, 1, 1, 1);
+DRIVER_MODULE(fhc, nexus, fhc_driver, fhc_devclass, 0, 0);
+MODULE_DEPEND(fhc, nexus, 1, 1, 1);
 MODULE_VERSION(fhc, 1);
 
 static const struct intr_controller fhc_ic = {

Modified: stable/7/sys/sparc64/pci/apb.c
==============================================================================
--- stable/7/sys/sparc64/pci/apb.c	Wed Jan 13 19:59:13 2010	(r202223)
+++ stable/7/sys/sparc64/pci/apb.c	Wed Jan 13 19:59:19 2010	(r202224)
@@ -113,6 +113,7 @@ static devclass_t pcib_devclass;
 
 DEFINE_CLASS_0(pcib, apb_driver, apb_methods, sizeof(struct apb_softc));
 DRIVER_MODULE(apb, pci, apb_driver, pcib_devclass, 0, 0);
+MODULE_DEPEND(apb, pci, 1, 1, 1);
 
 /* APB specific registers */
 #define	APBR_IOMAP	0xde

Modified: stable/7/sys/sparc64/pci/ofw_pcib.c
==============================================================================
--- stable/7/sys/sparc64/pci/ofw_pcib.c	Wed Jan 13 19:59:13 2010	(r202223)
+++ stable/7/sys/sparc64/pci/ofw_pcib.c	Wed Jan 13 19:59:19 2010	(r202224)
@@ -95,6 +95,7 @@ static devclass_t pcib_devclass;
 DEFINE_CLASS_0(pcib, ofw_pcib_driver, ofw_pcib_methods,
     sizeof(struct ofw_pcib_gen_softc));
 DRIVER_MODULE(ofw_pcib, pci, ofw_pcib_driver, pcib_devclass, 0, 0);
+MODULE_DEPEND(ofw_pcib, pci, 1, 1, 1);
 
 static int
 ofw_pcib_probe(device_t dev)

Modified: stable/7/sys/sparc64/sbus/sbus.c
==============================================================================
--- stable/7/sys/sparc64/sbus/sbus.c	Wed Jan 13 19:59:13 2010	(r202223)
+++ stable/7/sys/sparc64/sbus/sbus.c	Wed Jan 13 19:59:19 2010	(r202224)
@@ -247,6 +247,7 @@ static driver_t sbus_driver = {
 static devclass_t sbus_devclass;
 
 DRIVER_MODULE(sbus, nexus, sbus_driver, sbus_devclass, 0, 0);
+MODULE_DEPEND(sbus, nexus, 1, 1, 1);
 MODULE_VERSION(sbus, 1);
 
 #define	OFW_SBUS_TYPE	"sbus"

Modified: stable/7/sys/sparc64/sparc64/nexus.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/nexus.c	Wed Jan 13 19:59:13 2010	(r202223)
+++ stable/7/sys/sparc64/sparc64/nexus.c	Wed Jan 13 19:59:19 2010	(r202224)
@@ -145,6 +145,7 @@ static devclass_t nexus_devclass;
 
 DEFINE_CLASS_0(nexus, nexus_driver, nexus_methods, sizeof(struct nexus_softc));
 DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
+MODULE_VERSION(nexus, 1);
 
 static const char *const nexus_excl_name[] = {
 	"aliases",