diff options
| author | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 17:43:30 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 17:43:30 -0400 |
| commit | ddf3e298b33f3e15a2e6272e0146dfa940c89a74 (patch) | |
| tree | cd474d1eca4f337958e97a09dcb0974b1f8aba82 /drivers/usb/host/ehci-hub.c | |
| parent | 7a694ca74958b97ae2d437c8a730bddd9e9792c3 (diff) | |
| parent | 1d42a0ecf478962e8aede355a0be41365c117ff0 (diff) | |
Merge with /home/shaggy/git/linus-clean/
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)) |