From owner-p4-projects@FreeBSD.ORG  Thu Jun 30 03:59:02 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 19BED16A420; Thu, 30 Jun 2005 03:59:02 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E9C8B16A41C
	for <perforce@freebsd.org>; Thu, 30 Jun 2005 03:59:01 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D791243D48
	for <perforce@freebsd.org>; Thu, 30 Jun 2005 03:59:01 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5U3x1nZ071411
	for <perforce@freebsd.org>; Thu, 30 Jun 2005 03:59:01 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5U3x1pu071408
	for perforce@freebsd.org; Thu, 30 Jun 2005 03:59:01 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 30 Jun 2005 03:59:01 GMT
Message-Id: <200506300359.j5U3x1pu071408@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79228 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jun 2005 03:59:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=79228

Change 79228 by peter@peter_overcee on 2005/06/30 03:58:53

	Undo some changes, sync others with i386

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/NOTES#71 edit
.. //depot/projects/hammer/sys/modules/Makefile#80 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/NOTES#71 (text+ko) ====

@@ -252,12 +252,6 @@
 device		arcmsr		# Areca SATA II RAID
 
 #
-# Areca 11xx and 12xx series of SATA II RAID controllers.
-# CAM is required.
-#
-device		arcmsr		# Areca SATA II RAID
-
-#
 # 3ware 9000 series PATA/SATA RAID controller driver and options.
 # The driver is implemented as a SIM, and so, needs the CAM infrastructure.
 #
@@ -325,9 +319,9 @@
 device		digi_Xem
 device		digi_Xr
 # Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
-#device		pbio
-#hint.pbio.0.at="isa"
-#hint.pbio.0.port="0x360"
+device		pbio
+hint.pbio.0.at="isa"
+hint.pbio.0.port="0x360"
 # sx device is i386 and pc98 only at the moment.
 device		sx
 options 	SX_DEBUG
@@ -560,7 +554,3 @@
 
 # The I/O device
 device		io
-
-# asr old ioctls support, needed by raidutils
-
-options		ASR_COMPAT

==== //depot/projects/hammer/sys/modules/Makefile#80 (text+ko) ====

@@ -430,6 +430,7 @@
 _em=		em
 _ext2fs=	ext2fs
 _i2c=		i2c
+_ichwd=		ichwd
 _ida=		ida
 _if_ndis=	if_ndis
 _iir=		iir