diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:11:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:11:26 -0800 |
| commit | 74f5133bc757c27c168be048b66ddfe53160a793 (patch) | |
| tree | 087f97651013d3333dd7b86e418dff05a88a5ca5 /include/linux/usb.h | |
| parent | 08eb400cbebc7717f546845df7b87ad6f8711cf5 (diff) | |
v2.4.6.6 -> v2.4.6.7
- Andreas Dilger: various ext2 cleanups
- Richard Gooch: devfs update
- Johannes Erdfelt: USB updates
- Alan Cox: merges
- David Miller: fix SMP pktsched bootup deadlock (CONFIG_NET_SCHED)
- Roman Zippel: AFFS update
- Anton Altaparmakov: NTFS update
- me: fix races in vfork() (semaphores are not good completion handlers)
- Jeff Garzik: net driver updates, sysvfs update
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index d478980ebfbe..9fc2074b2d78 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -21,6 +21,7 @@ /* * USB types */ +#define USB_TYPE_MASK (0x03 << 5) #define USB_TYPE_STANDARD (0x00 << 5) #define USB_TYPE_CLASS (0x01 << 5) #define USB_TYPE_VENDOR (0x02 << 5) @@ -595,6 +596,7 @@ struct usb_device { int slow; /* Slow device? */ atomic_t refcnt; /* Reference count */ + struct semaphore serialize; unsigned int toggle[2]; /* one bit for each endpoint ([0] = IN, [1] = OUT) */ unsigned int halted[2]; /* endpoint halts; one bit per endpoint # & direction; */ |