Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[~andy/linux] / include / linux / usb / gpio_vbus.h

diff --git a/include/linux/usb/gpio_vbus.h b/include/linux/usb/gpio_vbus.h
index d9f03ccc2d60a69b323c5758c12c470cf5ae6f10..837bba604a0b7112f9acd63e41125dbedcbb5c53 100644 (file)
--- a/include/linux/usb/gpio_vbus.h
+++ b/include/linux/usb/gpio_vbus.h
@@ -17,6 +17,7 @@
  * @gpio_pullup: optional D+ or D- pullup GPIO (else negative/invalid)
  * @gpio_vbus_inverted: true if gpio_vbus is active low
  * @gpio_pullup_inverted: true if gpio_pullup is active low
+ * @wakeup: configure gpio_vbus as a wake-up source
  *
  * The VBUS sensing GPIO should have a pulldown, which will normally be
  * part of a resistor ladder turning a 4.0V-5.25V level on VBUS into a
@@ -27,4 +28,5 @@ struct gpio_vbus_mach_info {
        int gpio_pullup;
        bool gpio_vbus_inverted;
        bool gpio_pullup_inverted;
+       bool wakeup;
 };