From owner-svn-src-head@FreeBSD.ORG  Fri Sep 10 08:11:48 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A7BA1106564A;
	Fri, 10 Sep 2010 08:11:48 +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 96CBE8FC18;
	Fri, 10 Sep 2010 08:11:48 +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 o8A8Bmj3006000;
	Fri, 10 Sep 2010 08:11:48 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8A8Bm1B005997;
	Fri, 10 Sep 2010 08:11:48 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201009100811.o8A8Bm1B005997@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Fri, 10 Sep 2010 08:11:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212410 - in head/sys/dev: malo mwl
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Sep 2010 08:11:48 -0000

Author: bschmidt
Date: Fri Sep 10 08:11:48 2010
New Revision: 212410
URL: http://svn.freebsd.org/changeset/base/212410

Log:
  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
  MFC after:	1 week

Modified:
  head/sys/dev/malo/if_malo_pci.c
  head/sys/dev/mwl/if_mwl_pci.c

Modified: head/sys/dev/malo/if_malo_pci.c
==============================================================================
--- head/sys/dev/malo/if_malo_pci.c	Fri Sep 10 07:06:06 2010	(r212409)
+++ head/sys/dev/malo/if_malo_pci.c	Fri Sep 10 08:11:48 2010	(r212410)
@@ -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: head/sys/dev/mwl/if_mwl_pci.c
==============================================================================
--- head/sys/dev/mwl/if_mwl_pci.c	Fri Sep 10 07:06:06 2010	(r212409)
+++ head/sys/dev/mwl/if_mwl_pci.c	Fri Sep 10 08:11:48 2010	(r212410)
@@ -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);