Module Name: src
Committed By: pgoyette
Date: Mon Nov 26 10:43:37 UTC 2018
Modified Files:
src/sys/dev/usb [pgoyette-compat]: usbdi.c
Log Message:
Missed a $Id$ conflict in the last sync-with-HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.175.2.3 -r1.175.2.4 src/sys/dev/usb/usbdi.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/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.175.2.3 src/sys/dev/usb/usbdi.c:1.175.2.4
--- src/sys/dev/usb/usbdi.c:1.175.2.3 Mon Nov 26 01:52:49 2018
+++ src/sys/dev/usb/usbdi.c Mon Nov 26 10:43:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.175.2.3 2018/11/26 01:52:49 pgoyette Exp $ */
+/* $NetBSD: usbdi.c,v 1.175.2.4 2018/11/26 10:43:36 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,11 +32,7 @@
*/
#include <sys/cdefs.h>
-<<<<<<< usbdi.c
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.175.2.3 2018/11/26 01:52:49 pgoyette Exp $");
-=======
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.175.2.3 2018/11/26 01:52:49 pgoyette Exp $");
->>>>>>> 1.180
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.175.2.4 2018/11/26 10:43:36 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
