diff options
author | David S. Miller <davem@davemloft.net> | 2020-02-21 13:39:34 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-02-21 13:39:34 -0800 |
commit | e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06 (patch) | |
tree | 04b1728c397ad4604a6163529f51dfd48dfdbc07 /drivers/usb/core/usb.h | |
parent | b4d9785ce5c035b672f25df56706d0ff4e68b74e (diff) | |
parent | 0c0ddd6ae47c9238c18f475bcca675ca74c9dc31 (diff) | |
download | linux-e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflict resolution of ice_virtchnl_pf.c based upon work by
Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/core/usb.h')
-rw-r--r-- | drivers/usb/core/usb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index cf4783cf661a..3ad0ee57e859 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -37,6 +37,9 @@ extern void usb_authorize_interface(struct usb_interface *); extern void usb_detect_quirks(struct usb_device *udev); extern void usb_detect_interface_quirks(struct usb_device *udev); extern void usb_release_quirk_list(void); +extern bool usb_endpoint_is_blacklisted(struct usb_device *udev, + struct usb_host_interface *intf, + struct usb_endpoint_descriptor *epd); extern int usb_remove_device(struct usb_device *udev); extern int usb_get_device_descriptor(struct usb_device *dev, |