Merge branch 'master' into gfs2

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index caacf14371f5..93fdc3c35341 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -159,7 +159,7 @@ static const int cc_to_error [16] = {
         /* Bit Stuff  */               -EPROTO,
         /* Data Togg  */               -EILSEQ,
         /* Stall      */               -EPIPE,
-        /* DevNotResp */               -ETIMEDOUT,
+        /* DevNotResp */               -ETIME,
         /* PIDCheck   */               -EPROTO,
         /* UnExpPID   */               -EPROTO,
         /* DataOver   */               -EOVERFLOW,
@@ -389,8 +389,6 @@ struct ohci_hcd {
         unsigned long           next_statechange;       /* suspend/resume */
         u32                     fminterval;             /* saved register */
 
-        struct notifier_block   reboot_notifier;
-
         unsigned long           flags;          /* for HC bugs */
 #define OHCI_QUIRK_AMD756       0x01                    /* erratum #4 */
 #define OHCI_QUIRK_SUPERIO      0x02                    /* natsemi */