From owner-svn-src-head@FreeBSD.ORG  Tue Jul 10 05:39:06 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C2C401065672;
	Tue, 10 Jul 2012 05:39:06 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF0658FC16;
	Tue, 10 Jul 2012 05:39:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6A5d6HQ062438;
	Tue, 10 Jul 2012 05:39:06 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6A5d6I8062436;
	Tue, 10 Jul 2012 05:39:06 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201207100539.q6A5d6I8062436@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 10 Jul 2012 05:39:06 +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: r238335 - head/sys/arm/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: Tue, 10 Jul 2012 05:39:06 -0000

Author: imp
Date: Tue Jul 10 05:39:06 2012
New Revision: 238335
URL: http://svn.freebsd.org/changeset/base/238335

Log:
  Revert last change.  It was accidental.

Modified:
  head/sys/arm/conf/KB920X

Modified: head/sys/arm/conf/KB920X
==============================================================================
--- head/sys/arm/conf/KB920X	Tue Jul 10 04:17:49 2012	(r238334)
+++ head/sys/arm/conf/KB920X	Tue Jul 10 05:39:06 2012	(r238335)
@@ -21,16 +21,10 @@
 ident		KB920X
 
 include		"../at91/std.kb920x"
-# bring in the sam specific timers and such
-#include "../at91/std.at91sam9"
-nodevice	at91rm9200
-device		at91sam9
-device		at91sam9x25
 # The AT91 platform doesn't use /boot/loader, so we have to statically wire
 # hints.
 hints		"KB920X.hints"
 makeoptions	MODULES_OVERRIDE=""
-options		LINUX_BOOT_ABI
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 options 	DDB
@@ -87,7 +81,7 @@ device		lxtphy
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
 device		md
-#device		at91_twi		# TWI: Two Wire Interface
+device		at91_twi		# TWI: Two Wire Interface
 device		at91_spi		# SPI:
 device		spibus
 # MMC/SD
@@ -144,7 +138,6 @@ device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
 
-#device		cfi
 options		IEEE80211_SUPPORT_MESH
 
 options		AH_SUPPORT_AR5416