From owner-svn-src-all@FreeBSD.ORG  Thu Oct  7 09:30:35 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D24A3106566B;
	Thu,  7 Oct 2010 09:30:35 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C1CB38FC14;
	Thu,  7 Oct 2010 09:30:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o979UZnl035563;
	Thu, 7 Oct 2010 09:30:35 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o979UZho035561;
	Thu, 7 Oct 2010 09:30:35 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201010070930.o979UZho035561@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Thu, 7 Oct 2010 09:30:35 +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: r213510 - head/sys/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 07 Oct 2010 09:30:35 -0000

Author: cognet
Date: Thu Oct  7 09:30:35 2010
New Revision: 213510
URL: http://svn.freebsd.org/changeset/base/213510

Log:
  Add options I missed in the additionnal AT91 support commits.
  
  Submitted by:	Greg Ansley

Modified:
  head/sys/conf/options.arm

Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm	Thu Oct  7 09:07:48 2010	(r213509)
+++ head/sys/conf/options.arm	Thu Oct  7 09:30:35 2010	(r213510)
@@ -31,8 +31,11 @@ STARTUP_PAGETABLE_ADDR	opt_global.h
 XSCALE_CACHE_READ_WRITE_ALLOCATE	opt_global.h
 XSACLE_DISABLE_CCNT	opt_timer.h
 VERBOSE_INIT_ARM	opt_global.h
+AT91_ATE_USE_RMII	opt_at91.h
 AT91_BWCT		opt_at91.h
 AT91_TSC		opt_at91.h
 AT91_KWIKBYTE		opt_at91.h
+AT91_MCI_HAS_4WIRE	opt_at91.h
+AT91_MCI_SLOT_B		opt_at91.h
 CPU_FA526		opt_global.h
 CPU_FA626TE		opt_global.h