Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542

[linux-2.6] / include / linux / usb_ch9.h

diff --git a/include/linux/usb_ch9.h b/include/linux/usb_ch9.h
index 39e7ff4ffd28cb581a9f98a38e19e41e2c58a4fa..ee21e6bf3867a8bff6d2ac30a32ce6f4743a9536 100644 (file)
--- a/include/linux/usb_ch9.h
+++ b/include/linux/usb_ch9.h
@@ -19,7 +19,7 @@
 #ifndef __LINUX_USB_CH9_H
 #define __LINUX_USB_CH9_H
 
-#include <asm/types.h>         /* __u8 etc */
+#include <linux/types.h>       /* __u8 etc */
 
 /*-------------------------------------------------------------------------*/
 
@@ -294,8 +294,8 @@ struct usb_endpoint_descriptor {
        __le16 wMaxPacketSize;
        __u8  bInterval;
 
-       // NOTE:  these two are _only_ in audio endpoints.
-       // use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof.
+       /* NOTE:  these two are _only_ in audio endpoints. */
+       /* use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof. */
        __u8  bRefresh;
        __u8  bSynchAddress;
 } __attribute__ ((packed));