svn commit: r237137 - head/sys/arm/s3c2xx0

Warner Losh imp at FreeBSD.org
Fri Jun 15 16:50:32 UTC 2012


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);


More information about the svn-src-all mailing list