From dc2d3d67e99f5fa7a34e3befdf3ef08e2d0f1153 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 30 Sep 2010 05:01:22 -0700 Subject: [PATCH] --- yaml --- r: 213590 b: refs/heads/master c: 1b62d2583963d5974974aa923214bada7aa7b5d1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/devices.txt | 5 ++++- trunk/drivers/usb/misc/yurex.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f87e0923641c..f26b6c4e741c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bc235a2e24a5ef677daee3fd4f74f6cd643e23c +refs/heads/master: 1b62d2583963d5974974aa923214bada7aa7b5d1 diff --git a/trunk/Documentation/devices.txt b/trunk/Documentation/devices.txt index d0d1df6cb5de..3cab6b342017 100644 --- a/trunk/Documentation/devices.txt +++ b/trunk/Documentation/devices.txt @@ -2553,7 +2553,10 @@ Your cooperation is appreciated. 175 = /dev/usb/legousbtower15 16th USB Legotower device 176 = /dev/usb/usbtmc1 First USB TMC device ... - 192 = /dev/usb/usbtmc16 16th USB TMC device + 191 = /dev/usb/usbtmc16 16th USB TMC device + 192 = /dev/usb/yurex1 First USB Yurex device + ... + 209 = /dev/usb/yurex16 16th USB Yurex device 240 = /dev/usb/dabusb0 First daubusb device ... 243 = /dev/usb/dabusb3 Fourth dabusb device diff --git a/trunk/drivers/usb/misc/yurex.c b/trunk/drivers/usb/misc/yurex.c index 76b8ab47fe04..5f6443bc6142 100644 --- a/trunk/drivers/usb/misc/yurex.c +++ b/trunk/drivers/usb/misc/yurex.c @@ -47,9 +47,9 @@ static struct usb_device_id yurex_table[] = { MODULE_DEVICE_TABLE(usb, yurex_table); #ifdef CONFIG_USB_DYNAMIC_MINORS -#define YUREX_MINOR_BASE 0 +#define YUREX_MINOR_BASE 0 #else -#define YUREX_MINOR_BASE 224 /* not official yet */ +#define YUREX_MINOR_BASE 192 #endif /* Structure to hold all of our device specific stuff */