From owner-svn-src-all@FreeBSD.ORG  Tue Jan  5 14:03:46 2010
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 D9B7D106566B;
	Tue,  5 Jan 2010 14:03:46 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C84C28FC1E;
	Tue,  5 Jan 2010 14:03:46 +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 o05E3kam017906;
	Tue, 5 Jan 2010 14:03:46 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o05E3k3e017904;
	Tue, 5 Jan 2010 14:03:46 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201001051403.o05E3k3e017904@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 5 Jan 2010 14:03:46 +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: r201588 - stable/8/sys/dev/ahci
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, 05 Jan 2010 14:03:47 -0000

Author: mav
Date: Tue Jan  5 14:03:46 2010
New Revision: 201588
URL: http://svn.freebsd.org/changeset/base/201588

Log:
  MFC 200977:
  Avoid false positive probe on ICH6 chipsets.

Modified:
  stable/8/sys/dev/ahci/ahci.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/ahci/ahci.c
==============================================================================
--- stable/8/sys/dev/ahci/ahci.c	Tue Jan  5 14:02:12 2010	(r201587)
+++ stable/8/sys/dev/ahci/ahci.c	Tue Jan  5 14:03:46 2010	(r201588)
@@ -115,8 +115,8 @@ static struct {
 	{0x43931002, "ATI IXP700",	0},
 	{0x43941002, "ATI IXP800",	0},
 	{0x43951002, "ATI IXP800",	0},
-	{0x26528086, "Intel ICH6",	0},
-	{0x26538086, "Intel ICH6M",	0},
+	{0x26528086, "Intel ICH6",	AHCI_Q_NOFORCE},
+	{0x26538086, "Intel ICH6M",	AHCI_Q_NOFORCE},
 	{0x26818086, "Intel ESB2",	0},
 	{0x26828086, "Intel ESB2",	0},
 	{0x26838086, "Intel ESB2",	0},