From owner-svn-src-all@FreeBSD.ORG  Fri May 15 16:38:43 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 40ECD10656C9;
	Fri, 15 May 2009 16:38:43 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2ED218FC20;
	Fri, 15 May 2009 16:38:43 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4FGcga9028651;
	Fri, 15 May 2009 16:38:42 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4FGcgwT028650;
	Fri, 15 May 2009 16:38:42 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200905151638.n4FGcgwT028650@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 15 May 2009 16:38:42 +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: r192146 - head/sys/dev/bwi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 May 2009 16:38:43 -0000

Author: imp
Date: Fri May 15 16:38:42 2009
New Revision: 192146
URL: http://svn.freebsd.org/changeset/base/192146

Log:
  Cleanup module declarations:
  	Use "bwi" consistently
  	No need to have separate cardbus attachment
  	No need to declare a module version

Modified:
  head/sys/dev/bwi/if_bwi_pci.c

Modified: head/sys/dev/bwi/if_bwi_pci.c
==============================================================================
--- head/sys/dev/bwi/if_bwi_pci.c	Fri May 15 16:03:11 2009	(r192145)
+++ head/sys/dev/bwi/if_bwi_pci.c	Fri May 15 16:38:42 2009	(r192146)
@@ -245,9 +245,7 @@ static driver_t bwi_driver = {
 	sizeof (struct bwi_pci_softc)
 };
 static	devclass_t bwi_devclass;
-DRIVER_MODULE(if_bwi, pci, bwi_driver, bwi_devclass, 0, 0);
-DRIVER_MODULE(bwi, cardbus, bwi_driver, bwi_devclass, 0, 0);
-MODULE_VERSION(if_bwi, 1);
-MODULE_DEPEND(if_bwi, wlan, 1, 1, 1);		/* 802.11 media layer */
-MODULE_DEPEND(if_bwi, firmware, 1, 1, 1);	/* firmware support */
-MODULE_DEPEND(if_bwi, wlan_amrr, 1, 1, 1);
+DRIVER_MODULE(bwi, pci, bwi_driver, bwi_devclass, 0, 0);
+MODULE_DEPEND(bwi, wlan, 1, 1, 1);		/* 802.11 media layer */
+MODULE_DEPEND(bwi, firmware, 1, 1, 1);		/* firmware support */
+MODULE_DEPEND(bwi, wlan_amrr, 1, 1, 1);