From owner-svn-src-all@FreeBSD.ORG  Wed Oct  3 12:43:27 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 96440106566C;
	Wed,  3 Oct 2012 12:43:27 +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 81C4A8FC19;
	Wed,  3 Oct 2012 12:43:27 +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 q93ChRqH029655;
	Wed, 3 Oct 2012 12:43:27 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q93ChRQj029653;
	Wed, 3 Oct 2012 12:43:27 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201210031243.q93ChRQj029653@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 3 Oct 2012 12:43:27 +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: r241160 - head/sys/dev/ata
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: Wed, 03 Oct 2012 12:43:27 -0000

Author: mav
Date: Wed Oct  3 12:43:26 2012
New Revision: 241160
URL: http://svn.freebsd.org/changeset/base/241160

Log:
  Fix build without `options ATA_CAM`, broken by r241144.

Modified:
  head/sys/dev/ata/ata-sata.c

Modified: head/sys/dev/ata/ata-sata.c
==============================================================================
--- head/sys/dev/ata/ata-sata.c	Wed Oct  3 11:56:18 2012	(r241159)
+++ head/sys/dev/ata/ata-sata.c	Wed Oct  3 12:43:26 2012	(r241160)
@@ -155,9 +155,13 @@ ata_sata_phy_reset(device_t dev, int por
     int loop, retry, sata_rev;
     uint32_t val, val1;
 
+#ifdef ATA_CAM
     sata_rev = ch->user[port < 0 ? 0 : port].revision;
     if (sata_rev > 0)
 	quick = 0;
+#else
+    sata_rev = 0;
+#endif
 
     if (quick) {
 	if (ata_sata_scr_read(ch, port, ATA_SCONTROL, &val))