From owner-svn-src-all@FreeBSD.ORG  Tue Nov 13 07:34:47 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6E8E4107;
 Tue, 13 Nov 2012 07:34:47 +0000 (UTC)
 (envelope-from jmallett@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 54ACD8FC1A;
 Tue, 13 Nov 2012 07:34:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAD7Ylxr008458;
 Tue, 13 Nov 2012 07:34:47 GMT
 (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAD7YlVo008457;
 Tue, 13 Nov 2012 07:34:47 GMT
 (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201211130734.qAD7YlVo008457@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 13 Nov 2012 07:34:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242953 - head/sys/mips/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Nov 2012 07:34:47 -0000

Author: jmallett
Date: Tue Nov 13 07:34:46 2012
New Revision: 242953
URL: http://svnweb.freebsd.org/changeset/base/242953

Log:
  Add some useful options to consider.

Modified:
  head/sys/mips/conf/OCTEON1

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1	Tue Nov 13 07:33:45 2012	(r242952)
+++ head/sys/mips/conf/OCTEON1	Tue Nov 13 07:34:46 2012	(r242953)
@@ -261,6 +261,9 @@ device		firmware	# firmware assist modul
 # Note that 'bpf' is required for DHCP.
 device		bpf		# Berkeley packet filter
 
+# Hardware watchdog support.
+#device		octeon_wdog	# Octeon hardware watchdog
+
 # USB support
 options 	USB_DEBUG	# enable debug msgs
 device		octusb		# Cavium Octeon on-board USB interface (USB 2.0)
@@ -297,3 +300,14 @@ device		rum		# Ralink Technology RT2501U
 device		uath		# Atheros AR5523 wireless NICs
 device		ural		# Ralink Technology RT2500USB wireless NICs
 device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
+
+# crypto subsystem
+device		crypto		# core crypto support
+device		cryptodev	# /dev/crypto for access to h/w
+device		cryptocteon	# Octeon coprocessor 2 crypto offload
+
+# GPIO support
+#device		gpio
+
+# PMC support
+#device		hwpmc