From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 13 20:48:43 2010 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EF901065676; Wed, 13 Jan 2010 20:48:43 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EFFB98FC18; Wed, 13 Jan 2010 20:48:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DKmgAT019920; Wed, 13 Jan 2010 20:48:42 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0DKmg1a019912; Wed, 13 Jan 2010 20:48:42 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201001132048.o0DKmg1a019912@svn.freebsd.org> From: Marius Strobl Date: Wed, 13 Jan 2010 20:48:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202240 - in stable/6/sys: dev/auxio sparc64/central sparc64/fhc sparc64/pci sparc64/sbus sparc64/sparc64 X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 20:48:43 -0000 Author: marius Date: Wed Jan 13 20:48:42 2010 New Revision: 202240 URL: http://svn.freebsd.org/changeset/base/202240 Log: MFC: r200815, r200816 Provide and consume missing module dependency information. Modified: stable/6/sys/dev/auxio/auxio.c stable/6/sys/sparc64/central/central.c stable/6/sys/sparc64/fhc/fhc_nexus.c stable/6/sys/sparc64/pci/apb.c stable/6/sys/sparc64/pci/ofw_pcib.c stable/6/sys/sparc64/sbus/sbus.c stable/6/sys/sparc64/sparc64/nexus.c Directory Properties: stable/6/sys/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/dev/cxgb/ (props changed) Modified: stable/6/sys/dev/auxio/auxio.c ============================================================================== --- stable/6/sys/dev/auxio/auxio.c Wed Jan 13 20:41:27 2010 (r202239) +++ stable/6/sys/dev/auxio/auxio.c Wed Jan 13 20:48:42 2010 (r202240) @@ -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 /* - * 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/6/sys/sparc64/central/central.c ============================================================================== --- stable/6/sys/sparc64/central/central.c Wed Jan 13 20:41:27 2010 (r202239) +++ stable/6/sys/sparc64/central/central.c Wed Jan 13 20:48:42 2010 (r202240) @@ -112,6 +112,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/6/sys/sparc64/fhc/fhc_nexus.c ============================================================================== --- stable/6/sys/sparc64/fhc/fhc_nexus.c Wed Jan 13 20:41:27 2010 (r202239) +++ stable/6/sys/sparc64/fhc/fhc_nexus.c Wed Jan 13 20:48:42 2010 (r202240) @@ -89,6 +89,7 @@ static driver_t fhc_nexus_driver = { static devclass_t fhc_nexus_devclass; DRIVER_MODULE(fhc, nexus, fhc_nexus_driver, fhc_nexus_devclass, 0, 0); +MODULE_DEPEND(fhc, nexus, 1, 1, 1); static int fhc_nexus_probe(device_t dev) Modified: stable/6/sys/sparc64/pci/apb.c ============================================================================== --- stable/6/sys/sparc64/pci/apb.c Wed Jan 13 20:41:27 2010 (r202239) +++ stable/6/sys/sparc64/pci/apb.c Wed Jan 13 20:48:42 2010 (r202240) @@ -116,6 +116,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/6/sys/sparc64/pci/ofw_pcib.c ============================================================================== --- stable/6/sys/sparc64/pci/ofw_pcib.c Wed Jan 13 20:41:27 2010 (r202239) +++ stable/6/sys/sparc64/pci/ofw_pcib.c Wed Jan 13 20:48:42 2010 (r202240) @@ -97,6 +97,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/6/sys/sparc64/sbus/sbus.c ============================================================================== --- stable/6/sys/sparc64/sbus/sbus.c Wed Jan 13 20:41:27 2010 (r202239) +++ stable/6/sys/sparc64/sbus/sbus.c Wed Jan 13 20:48:42 2010 (r202240) @@ -261,6 +261,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/6/sys/sparc64/sparc64/nexus.c ============================================================================== --- stable/6/sys/sparc64/sparc64/nexus.c Wed Jan 13 20:41:27 2010 (r202239) +++ stable/6/sys/sparc64/sparc64/nexus.c Wed Jan 13 20:48:42 2010 (r202240) @@ -131,6 +131,7 @@ static driver_t nexus_driver = { static devclass_t nexus_devclass; DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0); +MODULE_VERSION(nexus, 1); static char *nexus_excl_name[] = { "aliases",