From owner-svn-src-projects@FreeBSD.ORG  Sun Jun 23 05:03:00 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 50E24A06;
 Sun, 23 Jun 2013 05:03:00 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 43CF41F08;
 Sun, 23 Jun 2013 05:03:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5N530bB007534;
 Sun, 23 Jun 2013 05:03:00 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5N52xn0007525;
 Sun, 23 Jun 2013 05:02:59 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201306230502.r5N52xn0007525@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 23 Jun 2013 05:02:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r252106 - in projects/altix2/sys: dev/ata ia64/conf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Jun 2013 05:03:00 -0000

Author: marcel
Date: Sun Jun 23 05:02:59 2013
New Revision: 252106
URL: http://svnweb.freebsd.org/changeset/base/252106

Log:
  Update to ATA changes:
  1.  There's no ATA_CAM option anymore.
  2.  There's no opt_ata.h anymore.

Modified:
  projects/altix2/sys/dev/ata/ata-ioc4.c
  projects/altix2/sys/ia64/conf/ALTIX

Modified: projects/altix2/sys/dev/ata/ata-ioc4.c
==============================================================================
--- projects/altix2/sys/dev/ata/ata-ioc4.c	Sun Jun 23 04:06:19 2013	(r252105)
+++ projects/altix2/sys/dev/ata/ata-ioc4.c	Sun Jun 23 05:02:59 2013	(r252106)
@@ -27,8 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_ata.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ata.h>

Modified: projects/altix2/sys/ia64/conf/ALTIX
==============================================================================
--- projects/altix2/sys/ia64/conf/ALTIX	Sun Jun 23 04:06:19 2013	(r252105)
+++ projects/altix2/sys/ia64/conf/ALTIX	Sun Jun 23 05:02:59 2013	(r252106)
@@ -27,7 +27,6 @@ device		uart
 device		vlan
 
 options 	ALT_BREAK_TO_DEBUGGER
-options 	ATA_CAM
 options 	CD9660
 options 	DDB
 options 	DEADLKRES