diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 03:36:53 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 03:36:53 +0300 |
| commit | 10955d2251387df3997d8b9b6c572dfad9f23dd0 (patch) | |
| tree | f7962c9d20c41ca9139f06164c3c484cd245d514 /drivers/usb/gadget/pxa2xx_udc.h | |
| parent | b2a5cd6938879b5bcfef0a73c28fea84c49519c2 (diff) | |
| parent | 4ae897df80019db433cd46cdd50d3b48463757d9 (diff) | |
| download | linux-10955d2251387df3997d8b9b6c572dfad9f23dd0.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: ftdi_sio - really enable EM1010PC
USB: remove incorrect struct class_device from the printer gadget
USB: pxa2xx_udc: fix misuse of clock enable/disable calls
USB: ftdi_sio: Workaround for broken Matrix Orbital serial port
USB: Add support for AXESSTEL MV110H CDMA modem
usb-storage: update earlier scatter-gather bug fix
USB: isp116x: fix enumeration on boot
USB: ehci: handle large bulk URBs correctly (again)
USB: spruce up the device blacklist
USB: fix comment of struct usb_interface
USB: update Kconfig entry for USB_SUSPEND
usb: Add support for the mos7820/7840-based B&B USB/RS485 converter to mos7840.c
Diffstat (limited to 'drivers/usb/gadget/pxa2xx_udc.h')
| -rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.h b/drivers/usb/gadget/pxa2xx_udc.h index b67e3ff5e4eb..e2c19e88c875 100644 --- a/drivers/usb/gadget/pxa2xx_udc.h +++ b/drivers/usb/gadget/pxa2xx_udc.h @@ -119,7 +119,9 @@ struct pxa2xx_udc { has_cfr : 1, req_pending : 1, req_std : 1, - req_config : 1; + req_config : 1, + suspended : 1, + active : 1; #define start_watchdog(dev) mod_timer(&dev->timer, jiffies + (HZ/200)) struct timer_list timer; |