[src/pgoyette-localcount]: src/sys Resolve a couple of conflicts

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2460a587f248
branches:  pgoyette-localcount
changeset: 852908:2460a587f248
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed Apr 26 02:57:17 2017 +0000

description:
Resolve a couple of conflicts

diffstat:

 sys/arch/sh3/include/ieeefp.h |  5 +----
 sys/dev/pci/piixpm.c          |  8 ++------
 2 files changed, 3 insertions(+), 10 deletions(-)

diffs (46 lines):

diff -r 0ca41cc57337 -r 2460a587f248 sys/arch/sh3/include/ieeefp.h
--- a/sys/arch/sh3/include/ieeefp.h     Wed Apr 26 02:52:13 2017 +0000
+++ b/sys/arch/sh3/include/ieeefp.h     Wed Apr 26 02:57:17 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ieeefp.h,v 1.4.62.1 2017/04/26 02:53:07 pgoyette Exp $ */
+/* $NetBSD: ieeefp.h,v 1.4.62.2 2017/04/26 02:57:17 pgoyette Exp $ */
 
 /*
  * Written by J.T. Conklin, Apr 6, 1995
@@ -32,14 +32,11 @@
 #if defined(_NETBSD_SOURCE)
 
 typedef int fp_except;
-<<<<<<< ieeefp.h
-=======
 
 #ifdef __SH_FPU_ANY__
 
 /* hardfloat */
 
->>>>>>> 1.7
 #define        FP_X_INV        FE_INVALID      /* invalid operation exception */
 #define        FP_X_DNML       FE_DENORMAL     /* denormalization exception */
 #define        FP_X_DZ         FE_DIVBYZERO    /* divide-by-zero exception */
diff -r 0ca41cc57337 -r 2460a587f248 sys/dev/pci/piixpm.c
--- a/sys/dev/pci/piixpm.c      Wed Apr 26 02:52:13 2017 +0000
+++ b/sys/dev/pci/piixpm.c      Wed Apr 26 02:57:17 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.49.2.3 2017/04/26 02:53:22 pgoyette Exp $ */
+/* $NetBSD: piixpm.c,v 1.49.2.4 2017/04/26 02:57:17 pgoyette Exp $ */
 /*     $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $      */
 
 /*
@@ -22,11 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-<<<<<<< piixpm.c
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.49.2.3 2017/04/26 02:53:22 pgoyette Exp $");
-=======
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.49.2.3 2017/04/26 02:53:22 pgoyette Exp $");
->>>>>>> 1.52
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.49.2.4 2017/04/26 02:57:17 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>