From owner-svn-src-stable@FreeBSD.ORG  Sat Sep 18 08:23:45 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 89A4B106566B;
	Sat, 18 Sep 2010 08:23:45 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 77FCC8FC0A;
	Sat, 18 Sep 2010 08:23:45 +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 o8I8Njre057549;
	Sat, 18 Sep 2010 08:23:45 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8I8NjAx057546;
	Sat, 18 Sep 2010 08:23:45 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201009180823.o8I8NjAx057546@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sat, 18 Sep 2010 08:23:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212818 - in stable/8/sys/dev: malo mwl
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Sep 2010 08:23:45 -0000

Author: bschmidt
Date: Sat Sep 18 08:23:45 2010
New Revision: 212818
URL: http://svn.freebsd.org/changeset/base/212818

Log:
  MFC r212410:
  Fix firmware module dependencies.
  
  malo and mwl use the firmware framework to access firmware images.
  Depending on the firmware modules itself is not required and in this
  case even wrong because no modules with those names exist.
  
  Pointed out by:	brucec

Modified:
  stable/8/sys/dev/malo/if_malo_pci.c
  stable/8/sys/dev/mwl/if_mwl_pci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/malo/if_malo_pci.c
==============================================================================
--- stable/8/sys/dev/malo/if_malo_pci.c	Sat Sep 18 08:20:39 2010	(r212817)
+++ stable/8/sys/dev/malo/if_malo_pci.c	Sat Sep 18 08:23:45 2010	(r212818)
@@ -371,4 +371,4 @@ static	devclass_t malo_devclass;
 DRIVER_MODULE(malo, pci, malo_pci_driver, malo_devclass, 0, 0);
 MODULE_VERSION(malo, 1);
 MODULE_DEPEND(malo, wlan, 1, 1, 1);		/* 802.11 media layer */
-MODULE_DEPEND(malo, malofw_fw, 1, 1, 1);
+MODULE_DEPEND(malo, firmware, 1, 1, 1);

Modified: stable/8/sys/dev/mwl/if_mwl_pci.c
==============================================================================
--- stable/8/sys/dev/mwl/if_mwl_pci.c	Sat Sep 18 08:20:39 2010	(r212817)
+++ stable/8/sys/dev/mwl/if_mwl_pci.c	Sat Sep 18 08:23:45 2010	(r212818)
@@ -313,4 +313,4 @@ static	devclass_t mwl_devclass;
 DRIVER_MODULE(mwl, pci, mwl_pci_driver, mwl_devclass, 0, 0);
 MODULE_VERSION(mwl, 1);
 MODULE_DEPEND(mwl, wlan, 1, 1, 1);		/* 802.11 media layer */
-MODULE_DEPEND(mwl, mwlfw_fw, 1, 1, 1);		/* firmware */
+MODULE_DEPEND(mwl, firmware, 1, 1, 1);