diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 09:52:20 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 09:52:20 +0100 |
commit | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (patch) | |
tree | 082cf7dd287f61635198011e61c3de1be130cc42 /drivers/usb/host/ohci.h | |
parent | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (diff) | |
parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
download | kernel_samsung_smdk4412-c2d9b8387bce8b4a0fd402fab7dc1319d11a418d.zip kernel_samsung_smdk4412-c2d9b8387bce8b4a0fd402fab7dc1319d11a418d.tar.gz kernel_samsung_smdk4412-c2d9b8387bce8b4a0fd402fab7dc1319d11a418d.tar.bz2 |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/usb/host/ohci.h')
-rw-r--r-- | drivers/usb/host/ohci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index 22e1ac1..71cdd22 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -371,7 +371,6 @@ struct ohci_hcd { * other external transceivers should be software-transparent */ struct otg_transceiver *transceiver; - unsigned power_budget; /* * memory management for queue data structures @@ -390,6 +389,7 @@ struct ohci_hcd { u32 fminterval; /* saved register */ struct work_struct rh_resume; + struct notifier_block reboot_notifier; unsigned long flags; /* for HC bugs */ #define OHCI_QUIRK_AMD756 0x01 /* erratum #4 */ |