From owner-svn-src-stable-8@FreeBSD.ORG  Fri Nov 19 09:26:40 2010
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 0EF1A1065694;
	Fri, 19 Nov 2010 09:26:40 +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 F1E898FC13;
	Fri, 19 Nov 2010 09:26:39 +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 oAJ9QdGq065995;
	Fri, 19 Nov 2010 09:26:39 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAJ9QdcD065993;
	Fri, 19 Nov 2010 09:26:39 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201011190926.oAJ9QdcD065993@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 19 Nov 2010 09:26:39 +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: r215512 - stable/8/sys/dev/ata/chipsets
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: Fri, 19 Nov 2010 09:26:40 -0000

Author: mav
Date: Fri Nov 19 09:26:39 2010
New Revision: 215512
URL: http://svn.freebsd.org/changeset/base/215512

Log:
  MFC r214672:
  Remove stale line, accidentally slipped into r214016.

Modified:
  stable/8/sys/dev/ata/chipsets/ata-intel.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/ata/chipsets/ata-intel.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-intel.c	Fri Nov 19 09:25:12 2010	(r215511)
+++ stable/8/sys/dev/ata/chipsets/ata-intel.c	Fri Nov 19 09:26:39 2010	(r215512)
@@ -315,7 +315,6 @@ ata_intel_ch_attach(device_t dev)
 			map &= 0x03;
 			if (map == 0x00) {
 				ch->flags |= ATA_SATA;
-				smap[ch->unit] = (ch->unit == 0) ? 0x20 : 0x31;
 				smap[0] = (ch->unit == 0) ? 0 : 1;
 				smap[1] = (ch->unit == 0) ? 2 : 3;
 			} else if (map == 0x02 && ch->unit == 0) {