diff options
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/msm_hsusb.h | 4 | ||||
| -rw-r--r-- | include/linux/usb/usbnet.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h index 894f157f418..66d6a9e1314 100644 --- a/include/linux/usb/msm_hsusb.h +++ b/include/linux/usb/msm_hsusb.h @@ -2,7 +2,7 @@ * * Copyright (C) 2008 Google, Inc. * Author: Brian Swetland <swetland@google.com> - * Copyright (c) 2009-2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2009-2014, The Linux Foundation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -359,6 +359,7 @@ struct msm_otg_platform_data { * @chg_check_timer: The timer used to implement the workaround to detect * very slow plug in of wall charger. * @ui_enabled: USB Intterupt is enabled or disabled. + * @pm_done: Indicates whether USB is PM resumed */ struct msm_otg { struct usb_phy phy; @@ -478,6 +479,7 @@ struct msm_otg { bool ext_chg_active; struct completion ext_chg_wait; int ui_enabled; + bool pm_done; }; struct ci13xxx_platform_data { diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index b2bf1229fe3..08db46e4f1e 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -138,9 +138,6 @@ struct driver_info { /* link reset handling, called from defer_kevent */ int (*link_reset)(struct usbnet *); - /*in case if usbnet wrapper wants to override rx_complete()*/ - void (*rx_complete) (struct urb *); - /* fixup rx packet (strip framing) */ int (*rx_fixup)(struct usbnet *dev, struct sk_buff *skb); @@ -250,7 +247,6 @@ extern void usbnet_set_msglevel(struct net_device *, u32); extern void usbnet_get_drvinfo(struct net_device *, struct ethtool_drvinfo *); extern int usbnet_nway_reset(struct net_device *net); extern void usbnet_terminate_urbs(struct usbnet *dev); -extern void rx_complete(struct urb *urb); extern int usbnet_manage_power(struct usbnet *, int); extern void usbnet_link_change(struct usbnet *, bool, bool); |