Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove conflict.

Browse Source
This commit is contained in:
christos 2005-12-05 15:17:18 +00:00
parent 9612f9a4de
commit 58b2cd40fa
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/compat/netbsd32/netbsd32_time.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netbsd32_time.c,v 1.16 2005/12/05 15:16:51 christos Exp $ */
/* $NetBSD: netbsd32_time.c,v 1.17 2005/12/05 15:17:18 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.16 2005/12/05 15:16:51 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.17 2005/12/05 15:17:18 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@ -528,14 +528,7 @@ netbsd32_clock_settime(l, v, retval)
return (error);
netbsd32_to_timespec(&ts32, &ats);
<<<<<<< netbsd32_time.c
return settime(p, &ats);
=======
if ((error = settime(p, &ats)))
return (error);
return 0;
>>>>>>> 1.15
}
int