From owner-svn-src-stable-8@FreeBSD.ORG  Thu Aug  4 03:04:05 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CF292106564A;
	Thu,  4 Aug 2011 03:04:05 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BE66C8FC16;
	Thu,  4 Aug 2011 03:04:05 +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 p74345nB041626;
	Thu, 4 Aug 2011 03:04:05 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p74345XW041623;
	Thu, 4 Aug 2011 03:04:05 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201108040304.p74345XW041623@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 4 Aug 2011 03:04:05 +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: r224645 - in stable/8: share/man/man4 sys/dev/hptiop
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Aug 2011 03:04:05 -0000

Author: delphij
Date: Thu Aug  4 03:04:05 2011
New Revision: 224645
URL: http://svn.freebsd.org/changeset/base/224645

Log:
  MFC r224583:
  
  Add PCI ID for RocketRAID 4321 and 4322.  A FreeNAS user have tested the
  change on RocketRAID 4322.
  
  Sponsored by: iXsystems, Inc.

Modified:
  stable/8/share/man/man4/hptiop.4
  stable/8/sys/dev/hptiop/hptiop.c
Directory Properties:
  stable/8/share/man/man4/   (props changed)
  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)

Modified: stable/8/share/man/man4/hptiop.4
==============================================================================
--- stable/8/share/man/man4/hptiop.4	Wed Aug  3 23:57:38 2011	(r224644)
+++ stable/8/share/man/man4/hptiop.4	Thu Aug  4 03:04:05 2011	(r224645)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 12, 2007
+.Dd August 1, 2011
 .Dt HPTIOP 4
 .Os
 .Sh NAME
@@ -60,6 +60,10 @@ driver supports the following SAS and SA
 .It
 HighPoint RocketRAID 4320
 .It
+HighPoint RocketRAID 4321
+.It
+HighPoint RocketRAID 4322
+.It
 HighPoint RocketRAID 3220
 .It
 HighPoint RocketRAID 3320

Modified: stable/8/sys/dev/hptiop/hptiop.c
==============================================================================
--- stable/8/sys/dev/hptiop/hptiop.c	Wed Aug  3 23:57:38 2011	(r224644)
+++ stable/8/sys/dev/hptiop/hptiop.c	Thu Aug  4 03:04:05 2011	(r224645)
@@ -1269,6 +1269,8 @@ static int hptiop_probe(device_t dev)
 	id = pci_get_device(dev);
 
 	switch (id) {
+		case 0x4322:
+		case 0x4321:
 		case 0x4320:
 			sas = 1;
 		case 0x3220: