From owner-svn-src-all@FreeBSD.ORG  Thu Aug 27 17:55:44 2009
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 AA890106568B;
	Thu, 27 Aug 2009 17:55:44 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99FB68FC3C;
	Thu, 27 Aug 2009 17:55:44 +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 n7RHtiNw003825;
	Thu, 27 Aug 2009 17:55:44 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7RHtiCT003823;
	Thu, 27 Aug 2009 17:55:44 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200908271755.n7RHtiCT003823@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Thu, 27 Aug 2009 17:55:44 +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: r196605 - head/sys/arm/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, 27 Aug 2009 17:55:44 -0000

Author: sam
Date: Thu Aug 27 17:55:44 2009
New Revision: 196605
URL: http://svn.freebsd.org/changeset/base/196605

Log:
  revert r196600; didn't notice it'd been done already
  
  Submitted by:	jhay

Modified:
  head/sys/arm/conf/CAMBRIA

Modified: head/sys/arm/conf/CAMBRIA
==============================================================================
--- head/sys/arm/conf/CAMBRIA	Thu Aug 27 17:53:25 2009	(r196604)
+++ head/sys/arm/conf/CAMBRIA	Thu Aug 27 17:55:44 2009	(r196605)
@@ -107,7 +107,6 @@ device		random		# Entropy device
 # Wireless NIC cards
 device		wlan		# 802.11 support
 options 	IEEE80211_DEBUG
-options 	IEEE80211_SUPPORT_MESH
 options 	IEEE80211_SUPPORT_TDMA
 options 	IEEE80211_SUPPORT_MESH
 device		wlan_wep	# 802.11 WEP support