Merge branch 'from-linus' into upstream

[linux-2.6-omap-h63xx.git] / drivers / usb / host / ohci.h

diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 8a9b9d9209e9276213a51fbc717d5c7aea0de85c..caacf14371f510dd45f031eb0c765d1b6e6aec8c 100644 (file)
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -389,7 +389,6 @@ struct ohci_hcd {
        unsigned long           next_statechange;       /* suspend/resume */
        u32                     fminterval;             /* saved register */
 
-       struct work_struct      rh_resume;
        struct notifier_block   reboot_notifier;
 
        unsigned long           flags;          /* for HC bugs */