summaryrefslogtreecommitdiff
path: root/libusb/descriptor.c
diff options
context:
space:
mode:
authorhjelmn <Nathan Hjelm hjelmn@cs.unm.edu>2013-12-11 23:52:34 +0000
committerPete Batard <pete@akeo.ie>2013-12-30 21:58:07 +0000
commit8cb3cb34fb7dca5d7586c68a61f2761a2e103195 (patch)
tree6a244d89d3b7b8c4c4d2accb7822acb9450eb2ba /libusb/descriptor.c
parent8b46e1c088167eb86b1712765896e2f17d70d148 (diff)
downloadlibusb-mergeback.tar.gz
misc: revert all references to libusb/libusb.infomergeback
Diffstat (limited to 'libusb/descriptor.c')
-rw-r--r--libusb/descriptor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index e1c4915..52c9774 100644
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
/*
- * USB descriptor handling functions for libusbx
+ * USB descriptor handling functions for libusb
* Copyright © 2007 Daniel Drake <dsd@gentoo.org>
* Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
*
@@ -541,7 +541,7 @@ int usbi_device_cache_descriptor(libusb_device *dev)
*
* This is a non-blocking function; the device descriptor is cached in memory.
*
- * Note since libusbx-1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102, this
+ * Note since libusb-1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102, this
* function always succeeds.
*
* \param dev the device