summaryrefslogtreecommitdiff
path: root/include/linux/usb
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-30 19:56:23 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-30 19:56:23 +0400
commit1d8fcba1de632d7a43349788ad534c5a32c5a44c (patch)
treebcc6dec544fc2d9ab03a8e40f7c2d3242b58d64d /include/linux/usb
parentb527caee1b91946db844b1dc63d4f726958891c8 (diff)
downloadlinux-1d8fcba1de632d7a43349788ad534c5a32c5a44c.tar.xz
Revert "cdc_subset: deal with a device that needs reset for timeout"
This reverts commit 20fbe3ae990fd54fc7d1f889d61958bc8b38f254. As reported by Stephen Rothwell, it causes compile failures in certain configurations: drivers/net/usb/cdc_subset.c:360:15: error: 'dummy_prereset' undeclared here (not in a function) .pre_reset = dummy_prereset, ^ drivers/net/usb/cdc_subset.c:361:16: error: 'dummy_postreset' undeclared here (not in a function) .post_reset = dummy_postreset, ^ Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: David Miller <davem@davemloft.net> Cc: Oliver Neukum <oneukum@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/usb')
-rw-r--r--include/linux/usb/usbnet.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 26088feb6608..0662e98fef72 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -148,9 +148,6 @@ struct driver_info {
struct sk_buff *(*tx_fixup)(struct usbnet *dev,
struct sk_buff *skb, gfp_t flags);
- /* recover from timeout */
- void (*recover)(struct usbnet *dev);
-
/* early initialization code, can sleep. This is for minidrivers
* having 'subminidrivers' that need to do extra initialization
* right after minidriver have initialized hardware. */