diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /drivers/usb/host/ehci-hub.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'drivers/usb/host/ehci-hub.c')
| -rw-r--r-- | drivers/usb/host/ehci-hub.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 2373537fabed..02fefab3501e 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c | |||
| @@ -281,6 +281,8 @@ ehci_hub_descriptor ( | |||
| 281 | temp = 0x0008; /* per-port overcurrent reporting */ | 281 | temp = 0x0008; /* per-port overcurrent reporting */ |
| 282 | if (HCS_PPC (ehci->hcs_params)) | 282 | if (HCS_PPC (ehci->hcs_params)) |
| 283 | temp |= 0x0001; /* per-port power control */ | 283 | temp |= 0x0001; /* per-port power control */ |
| 284 | else | ||
| 285 | temp |= 0x0002; /* no power switching */ | ||
| 284 | #if 0 | 286 | #if 0 |
| 285 | // re-enable when we support USB_PORT_FEAT_INDICATOR below. | 287 | // re-enable when we support USB_PORT_FEAT_INDICATOR below. |
| 286 | if (HCS_INDICATOR (ehci->hcs_params)) | 288 | if (HCS_INDICATOR (ehci->hcs_params)) |