From owner-svn-src-all@FreeBSD.ORG  Mon May 18 08:12:10 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A46C2B01;
 Mon, 18 May 2015 08:12:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 92BFF10C4;
 Mon, 18 May 2015 08:12:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4I8C8NX044221;
 Mon, 18 May 2015 08:12:08 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4I8C8Dp044220;
 Mon, 18 May 2015 08:12:08 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201505180812.t4I8C8Dp044220@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 18 May 2015 08:12:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r283052 - head/sys/arm/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.20
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: Mon, 18 May 2015 08:12:10 -0000

Author: andrew
Date: Mon May 18 08:12:08 2015
New Revision: 283052
URL: https://svnweb.freebsd.org/changeset/base/283052

Log:
  Clean up the style to be "include<space><tab>" and remove options already
  in std.armv6.

Modified:
  head/sys/arm/conf/ALPINE

Modified: head/sys/arm/conf/ALPINE
==============================================================================
--- head/sys/arm/conf/ALPINE	Mon May 18 06:07:02 2015	(r283051)
+++ head/sys/arm/conf/ALPINE	Mon May 18 08:12:08 2015	(r283052)
@@ -19,8 +19,8 @@
 
 ident		ALPINE
 
-include		"std.armv6"
-include		"../annapurna/alpine/std.alpine"
+include 	"std.armv6"
+include 	"../annapurna/alpine/std.alpine"
 
 makeoptions	MODULES_OVERRIDE=""
 makeoptions	WERROR="-Werror"
@@ -35,11 +35,6 @@ options 	BREAK_TO_DEBUGGER
 options 	KDB
 options 	DDB			#Enable the kernel debugger
 
-# NFS support
-options 	NFSCL			#Network Filesystem Client
-options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-
 # Interrupt controller
 device		gic