From owner-svn-src-head@FreeBSD.ORG  Wed Jan  7 01:41:46 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 4A4FE8BD;
 Wed,  7 Jan 2015 01:41:46 +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 3758D15D8;
 Wed,  7 Jan 2015 01:41:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t071fk1x065012;
 Wed, 7 Jan 2015 01:41:46 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t071fkDM065011;
 Wed, 7 Jan 2015 01:41:46 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201501070141.t071fkDM065011@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 7 Jan 2015 01:41:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276773 - head/sys/mips/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Wed, 07 Jan 2015 01:41:46 -0000

Author: bz
Date: Wed Jan  7 01:41:45 2015
New Revision: 276773
URL: https://svnweb.freebsd.org/changeset/base/276773

Log:
  Remove the machine directive from the common MALTA* configuration file
  to avoid conflicting machine lines for the MALTA64 kernel configuration
  making config(8) go barf and builds to fail.
  
  Pointed out by:	adrian

Modified:
  head/sys/mips/conf/MALTA_COMMON

Modified: head/sys/mips/conf/MALTA_COMMON
==============================================================================
--- head/sys/mips/conf/MALTA_COMMON	Wed Jan  7 01:01:39 2015	(r276772)
+++ head/sys/mips/conf/MALTA_COMMON	Wed Jan  7 01:41:45 2015	(r276773)
@@ -2,8 +2,6 @@
 #
 # $FreeBSD$
 
-machine		mips mipsel	# Malta supports both, so it isn't in std.malta
-
 options 	YAMON
 
 # Don't build any modules yet.