svn commit: r238335 - head/sys/arm/conf

[Warner Losh]

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