Date: Fri, 15 Jun 2012 16:50:32 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r237137 - head/sys/arm/s3c2xx0 Message-ID: <201206151650.q5FGoWTC092916@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206151650.q5FGoWTC092916>