diff -Naur -X dontdiff linux-2.5.1-pre5-clean/drivers/usb/devices.c /mnt/zip/linux-2.5.1-pre5/drivers/usb/devices.c
--- linux-2.5.1-pre5-clean/drivers/usb/devices.c	Sun Oct 21 12:13:11 2001
+++ /mnt/zip/linux-2.5.1-pre5/drivers/usb/devices.c	Sun Dec  2 21:59:08 2001
@@ -139,9 +139,12 @@
 	{USB_CLASS_PHYSICAL,		"PID"},
 	{USB_CLASS_PRINTER,		"print"},
 	{USB_CLASS_MASS_STORAGE,	"stor."},
-	{USB_CLASS_DATA,		"data"},
+	{USB_CLASS_CDC_DATA,		"data"},
 	{USB_CLASS_APP_SPEC,		"app."},
 	{USB_CLASS_VENDOR_SPEC,		"vend."},
+	{USB_CLASS_STILL_IMAGE,         "still"},
+	{USB_CLASS_CSCID,               "scard"},
+        {USB_CLASS_CONTENT_SEC,         "c-sec"},
 	{-1,				"unk."}		/* leave as last */
 };
 
diff -Naur -X dontdiff linux-2.5.1-pre5-clean/include/linux/usb.h /mnt/zip/linux-2.5.1-pre5/include/linux/usb.h
--- linux-2.5.1-pre5-clean/include/linux/usb.h	Sun Dec  2 22:31:20 2001
+++ /mnt/zip/linux-2.5.1-pre5/include/linux/usb.h	Sun Dec  2 21:51:12 2001
@@ -11,10 +11,13 @@
 #define USB_CLASS_COMM			2
 #define USB_CLASS_HID			3
 #define USB_CLASS_PHYSICAL		5
+#define USB_CLASS_STILL_IMAGE           6
 #define USB_CLASS_PRINTER		7
 #define USB_CLASS_MASS_STORAGE		8
 #define USB_CLASS_HUB			9
-#define USB_CLASS_DATA			10
+#define USB_CLASS_CDC_DATA		0x0a
+#define USB_CLASS_CSCID                 0x0b /* chip+ smart card */
+#define USB_CLASS_CONTENT_SEC           0x0d /* content security */
 #define USB_CLASS_APP_SPEC		0xfe
 #define USB_CLASS_VENDOR_SPEC		0xff
 
