linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / usb / core / hcd.h

diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index 7022aaf..591b5aa 100644 (file)
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -78,6 +78,8 @@ struct usb_hcd {      /* usb_bus.hcpriv points to this */
 #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? */
 
        /* The next flag is a stopgap, to be removed when all the HCDs
@@ -362,7 +364,7 @@ extern void usb_set_device_state(struct usb_device *udev,
 /* exported only within usbcore */
 
 extern struct list_head usb_bus_list;
-extern struct mutex usb_bus_list_lock;
+extern struct semaphore usb_bus_list_lock;
 extern wait_queue_head_t usb_kill_urb_queue;
 
 extern struct usb_bus *usb_bus_get (struct usb_bus *bus);