From owner-svn-src-all@FreeBSD.ORG  Tue Jan 10 00:27:37 2012
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 E518D106567C;
	Tue, 10 Jan 2012 00:27:37 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CFD8A8FC19;
	Tue, 10 Jan 2012 00:27:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0A0RbFW069987;
	Tue, 10 Jan 2012 00:27:37 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0A0RbeN069985;
	Tue, 10 Jan 2012 00:27:37 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201201100027.q0A0RbeN069985@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 10 Jan 2012 00:27:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229894 - stable/7/sys/dev/sio
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: Tue, 10 Jan 2012 00:27:38 -0000

Author: eadler (ports committer)
Date: Tue Jan 10 00:27:37 2012
New Revision: 229894
URL: http://svn.freebsd.org/changeset/base/229894

Log:
  MFC r227532:
  	- add support for Broadcom 802.11bg/EDGE/GPRS CardBus (Serial)
  	- correct mislabeling of 0x432214e4 device
  
  PR:		kern/119606
  Approved by:	jhb

Modified:
  stable/7/sys/dev/sio/sio_pci.c
Directory Properties:
  stable/7/sys/   (props changed)

Modified: stable/7/sys/dev/sio/sio_pci.c
==============================================================================
--- stable/7/sys/dev/sio/sio_pci.c	Tue Jan 10 00:27:16 2012	(r229893)
+++ stable/7/sys/dev/sio/sio_pci.c	Tue Jan 10 00:27:37 2012	(r229894)
@@ -77,7 +77,8 @@ static struct pci_ids pci_ids[] = {
 	{ 0x7101135e, "SeaLevel Ultra 530.PCI Single Port Serial", 0x18 },
 	{ 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 },
 	{ 0x0103115d, "Xircom Cardbus modem", 0x10 },
-	{ 0x432214e4, "Broadcom 802.11g/GPRS CardBus (Serial)", 0x10 },
+	{ 0x432214e4, "Broadcom 802.11b/GPRS CardBus (Serial)", 0x10 },
+	{ 0x434414e4, "Broadcom 802.11bg/EDGE/GPRS CardBus (Serial)", 0x10 },
 	{ 0x01c0135c, "Quatech SSCLP-200/300", 0x18 
 		/* 
 		 * NB: You must mount the "SPAD" jumper to correctly detect