From owner-svn-src-head@FreeBSD.ORG  Mon Feb 23 22:56:03 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63EC01065673;
	Mon, 23 Feb 2009 22:56:03 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 51CB08FC0C;
	Mon, 23 Feb 2009 22:56:03 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1NMu3s1041937;
	Mon, 23 Feb 2009 22:56:03 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1NMu3oK041935;
	Mon, 23 Feb 2009 22:56:03 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200902232256.n1NMu3oK041935@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Mon, 23 Feb 2009 22:56:03 +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: r188961 - head/sys/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Feb 2009 22:56:04 -0000

Author: thompsa
Date: Mon Feb 23 22:56:03 2009
New Revision: 188961
URL: http://svn.freebsd.org/changeset/base/188961

Log:
  - comment out slhci in NOTES for the moment
  - rearrange the ucom entry so its recognised by config(8)

Modified:
  head/sys/conf/NOTES
  head/sys/conf/files

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Mon Feb 23 22:49:43 2009	(r188960)
+++ head/sys/conf/NOTES	Mon Feb 23 22:56:03 2009	(r188961)
@@ -2402,7 +2402,7 @@ device		ohci
 # EHCI controller
 device		ehci
 # SL811 Controller
-device 		slhci
+#device 		slhci
 # General USB code (mandatory for USB)
 device		usb
 #

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Mon Feb 23 22:49:43 2009	(r188960)
+++ head/sys/conf/files	Mon Feb 23 22:56:03 2009	(r188961)
@@ -1621,8 +1621,8 @@ dev/usb/serial/uplcom.c		optional uplcom
 dev/usb/serial/uslcom.c		optional uslcom
 dev/usb/serial/uvisor.c		optional uvisor
 dev/usb/serial/uvscom.c		optional uvscom
-dev/usb/serial/usb_serial.c \
-	optional (ucom | u3g | uark | ubsa | ubser | uchcom | ucycom | ufoma | uftdi | ugensa | uipaq | ulpt | umct | umodem | umoscom | uplcom | uslcom | uvisor | uvscom)
+dev/usb/serial/usb_serial.c 	optional ucom | \
+	(u3g | uark | ubsa | ubser | uchcom | ucycom | ufoma | uftdi | ugensa | uipaq | ulpt | umct | umodem | umoscom | uplcom | uslcom | uvisor | uvscom)
 #
 # USB bluetooth drivers
 #