Module Name: src
Committed By: skrll
Date: Sun Apr 10 15:32:26 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: xhci.c
Log Message:
Fix merge botch
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.55 -r1.28.2.56 src/sys/dev/usb/xhci.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/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.55 src/sys/dev/usb/xhci.c:1.28.2.56
--- src/sys/dev/usb/xhci.c:1.28.2.55 Fri Apr 8 09:48:14 2016
+++ src/sys/dev/usb/xhci.c Sun Apr 10 15:32:26 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.55 2016/04/08 09:48:14 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.56 2016/04/10 15:32:26 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.55 2016/04/08 09:48:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.56 2016/04/10 15:32:26 skrll Exp $");
#include "opt_usb.h"
@@ -2316,8 +2316,6 @@ xhci_new_device(device_t parent, struct
usbd_get_device_strings(dev);
- usbd_get_device_strings(dev);
-
usbd_add_dev_event(USB_EVENT_DEVICE_ATTACH, dev);
if ((depth == 0) && (port == 0)) {
