[src/pgoyette-compat]: src/sys/dev/pci And one more missed conflict. (I thin...

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

details:   https://anonhg.NetBSD.org/src/rev/5dfe4be42608
branches:  pgoyette-compat
changeset: 446185:5dfe4be42608
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Nov 26 13:16:46 2018 +0000

description:
And one more missed conflict.  (I think this is the last one.)

diffstat:

 sys/dev/pci/xhci_pci.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r 2f9145ccd943 -r 5dfe4be42608 sys/dev/pci/xhci_pci.c
--- a/sys/dev/pci/xhci_pci.c    Mon Nov 26 12:42:48 2018 +0000
+++ b/sys/dev/pci/xhci_pci.c    Mon Nov 26 13:16:46 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci_pci.c,v 1.11.2.4 2018/11/26 01:52:47 pgoyette Exp $       */
+/*     $NetBSD: xhci_pci.c,v 1.11.2.5 2018/11/26 13:16:46 pgoyette Exp $       */
 /*     OpenBSD: xhci_pci.c,v 1.4 2014/07/12 17:38:51 yuo Exp   */
 
 /*
@@ -32,11 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-<<<<<<< xhci_pci.c
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.11.2.4 2018/11/26 01:52:47 pgoyette Exp $");
-=======
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.11.2.4 2018/11/26 01:52:47 pgoyette Exp $");
->>>>>>> 1.17
+__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.11.2.5 2018/11/26 13:16:46 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_xhci_pci.h"