diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-30 15:56:59 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-30 15:56:59 -0800 |
| commit | d2149b542382bfc206cb28485108f6470c979566 (patch) | |
| tree | 484fad0d7493a9cfe33202db3687d348c0140f33 /drivers/usb/core/hcd.h | |
| parent | 25741b3e43151bc207dd2b850b0bb157c442682b (diff) | |
| parent | 346f7dbb17cb7d84317b4410df2e8f7bf2e57f44 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/usb/core/hcd.h')
| -rw-r--r-- | drivers/usb/core/hcd.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h index 24a62a2ff86..c8a1b350e2c 100644 --- a/drivers/usb/core/hcd.h +++ b/drivers/usb/core/hcd.h @@ -72,7 +72,12 @@ struct usb_hcd { /* usb_bus.hcpriv points to this */ * hardware info/state */ const struct hc_driver *driver; /* hw-specific hooks */ - unsigned saw_irq : 1; + + /* Flags that need to be manipulated atomically */ + unsigned long flags; +#define HCD_FLAG_HW_ACCESSIBLE 0x00000001 +#define HCD_FLAG_SAW_IRQ 0x00000002 + unsigned can_wakeup:1; /* hw supports wakeup? */ unsigned remote_wakeup:1;/* sw should use wakeup? */ unsigned rh_registered:1;/* is root hub registered? */ |