diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-27 22:03:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 22:03:52 -0400 |
| commit | 716b43303df605510399d6da0d0dd4e2ea376e7c (patch) | |
| tree | 57412aaf516b7a10b4b81064aeda318514fec168 /drivers/usb/host/ohci.h | |
| parent | 5696c1944a33b4434a9a1ebb6383b906afd43a10 (diff) | |
| parent | c7b645f934e52a54af58142d91fb51f881f8ce26 (diff) | |
Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
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 22e1ac138ac0..71cdd2262860 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h | |||
| @@ -371,7 +371,6 @@ struct ohci_hcd { | |||
| 371 | * other external transceivers should be software-transparent | 371 | * other external transceivers should be software-transparent |
| 372 | */ | 372 | */ |
| 373 | struct otg_transceiver *transceiver; | 373 | struct otg_transceiver *transceiver; |
| 374 | unsigned power_budget; | ||
| 375 | 374 | ||
| 376 | /* | 375 | /* |
| 377 | * memory management for queue data structures | 376 | * memory management for queue data structures |
| @@ -390,6 +389,7 @@ struct ohci_hcd { | |||
| 390 | u32 fminterval; /* saved register */ | 389 | u32 fminterval; /* saved register */ |
| 391 | 390 | ||
| 392 | struct work_struct rh_resume; | 391 | struct work_struct rh_resume; |
| 392 | struct notifier_block reboot_notifier; | ||
| 393 | 393 | ||
| 394 | unsigned long flags; /* for HC bugs */ | 394 | unsigned long flags; /* for HC bugs */ |
| 395 | #define OHCI_QUIRK_AMD756 0x01 /* erratum #4 */ | 395 | #define OHCI_QUIRK_AMD756 0x01 /* erratum #4 */ |