From owner-p4-projects@FreeBSD.ORG  Wed Feb 20 19:44:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 66AE716A407; Wed, 20 Feb 2008 19:44:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2038C16A401
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 19:44:07 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0880513C44B
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 19:44:07 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1KJi6JP087162
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 19:44:06 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KJi6iT087159
	for perforce@freebsd.org; Wed, 20 Feb 2008 19:44:06 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 20 Feb 2008 19:44:06 GMT
Message-Id: <200802201944.m1KJi6iT087159@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135833 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: Wed, 20 Feb 2008 19:44:07 -0000

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

Change 135833 by sam@sam_ebb on 2008/02/20 19:43:08

	IFC

Affected files ...

.. //depot/projects/vap/sys/i386/conf/GENERIC#7 integrate

Differences ...

==== //depot/projects/vap/sys/i386/conf/GENERIC#7 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.480 2008/01/07 21:40:10 jhb Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.481 2008/02/03 07:07:30 scottl Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -140,7 +140,6 @@
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
 device		hptmv		# Highpoint RocketRAID 182x
 device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
-device		rr232x		# Highpoint RocketRAID 232x
 device		iir		# Intel Integrated RAID
 device		ips		# IBM (Adaptec) ServeRAID
 device		mly		# Mylex AcceleRAID/eXtremeRAID