From owner-svn-src-projects@FreeBSD.ORG  Tue Jul 10 00:55:41 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id ADFBF106566C;
	Tue, 10 Jul 2012 00:55:41 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99D028FC0A;
	Tue, 10 Jul 2012 00:55:41 +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 q6A0tfco049976;
	Tue, 10 Jul 2012 00:55:41 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6A0tfkh049974;
	Tue, 10 Jul 2012 00:55:41 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201207100055.q6A0tfkh049974@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 10 Jul 2012 00:55:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238323 - projects/altix2/sys/ia64/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 10 Jul 2012 00:55:41 -0000

Author: marcel
Date: Tue Jul 10 00:55:41 2012
New Revision: 238323
URL: http://svn.freebsd.org/changeset/base/238323

Log:
  We have a working CD drive. Add cd(4) and enable ATA_CAM.
  Remove commented-out KTR options.

Modified:
  projects/altix2/sys/ia64/conf/ALTIX

Modified: projects/altix2/sys/ia64/conf/ALTIX
==============================================================================
--- projects/altix2/sys/ia64/conf/ALTIX	Tue Jul 10 00:54:24 2012	(r238322)
+++ projects/altix2/sys/ia64/conf/ALTIX	Tue Jul 10 00:55:41 2012	(r238323)
@@ -7,9 +7,9 @@ makeoptions	DEBUG=-g
 makeoptions	MODULES_OVERRIDE=""
 
 device		ata
-device		atadisk
 device		bge
 device		bpf
+device		cd
 device		da
 device		ether
 device		firmware
@@ -28,6 +28,7 @@ device		uart
 device		vlan
 
 options 	ALT_BREAK_TO_DEBUGGER
+options 	ATA_CAM
 options 	CD9660
 options 	DDB
 options 	DEADLKRES
@@ -62,8 +63,3 @@ options 	UFS_DIRHASH
 options 	WITNESS
 options 	WITNESS_SKIPSPIN
 options 	_KPOSIX_PRIORITY_SCHEDULING
-
-#options 	KTR
-#options 	KTR_COMPILE=KTR_INTR
-#options 	KTR_MASK=KTR_INTR
-#options 	KTR_VERBOSE