Module Name: src
Committed By: pgoyette
Date: Mon Nov 26 13:16:46 UTC 2018
Modified Files:
src/sys/dev/pci [pgoyette-compat]: xhci_pci.c
Log Message:
And one more missed conflict. (I think this is the last one.)
To generate a diff of this commit:
cvs rdiff -u -r1.11.2.4 -r1.11.2.5 src/sys/dev/pci/xhci_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/xhci_pci.c
diff -u src/sys/dev/pci/xhci_pci.c:1.11.2.4 src/sys/dev/pci/xhci_pci.c:1.11.2.5
--- src/sys/dev/pci/xhci_pci.c:1.11.2.4 Mon Nov 26 01:52:47 2018
+++ src/sys/dev/pci/xhci_pci.c Mon Nov 26 13:16:46 2018
@@ -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"
