From owner-svn-src-all@FreeBSD.ORG  Fri Jun 15 16:50:32 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1B56106564A;
	Fri, 15 Jun 2012 16:50:32 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 8DE208FC14;
	Fri, 15 Jun 2012 16:50:32 +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 q5FGoW5d092918;
	Fri, 15 Jun 2012 16:50:32 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5FGoWTC092916;
	Fri, 15 Jun 2012 16:50:32 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201206151650.q5FGoWTC092916@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 15 Jun 2012 16:50:32 +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: r237137 - head/sys/arm/s3c2xx0
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: Fri, 15 Jun 2012 16:50:32 -0000

Author: imp
Date: Fri Jun 15 16:50:32 2012
New Revision: 237137
URL: http://svn.freebsd.org/changeset/base/237137

Log:
  Remove stray line from merge.

Modified:
  head/sys/arm/s3c2xx0/s3c24x0_machdep.c

Modified: head/sys/arm/s3c2xx0/s3c24x0_machdep.c
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0_machdep.c	Fri Jun 15 15:32:16 2012	(r237136)
+++ head/sys/arm/s3c2xx0/s3c24x0_machdep.c	Fri Jun 15 16:50:32 2012	(r237137)
@@ -249,7 +249,6 @@ initarm(struct arm_boot_params *abp)
 	i = 0;
 	set_cpufuncs();
 	cpufuncs.cf_sleep = s3c24x0_sleep;
-	lastaddr = fake_preload_metadata();
 
 	pcpu_init(pcpup, 0, sizeof(struct pcpu));
 	PCPU_SET(curthread, &thread0);