diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-06-13 15:38:11 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-06-13 15:38:11 -0400 |
| commit | 76df73ff90e99681a99e457aec4cfe0a240b7982 (patch) | |
| tree | 0a6302b1a8e5d11aeed8aa49f7e846f35aad4f5a /drivers/usb/host/ohci-pxa27x.c | |
| parent | 5c601d0c942f5aaf7f3cff7e08f61047d70a964e (diff) | |
| parent | 86bc843a268058df558844b6bf64531617fbc698 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/usb/host/ohci-pxa27x.c')
| -rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index acde8868da2..fafe7c1265b 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
| @@ -185,6 +185,9 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device | |||
| 185 | /* Select Power Management Mode */ | 185 | /* Select Power Management Mode */ |
| 186 | pxa27x_ohci_select_pmm(inf->port_mode); | 186 | pxa27x_ohci_select_pmm(inf->port_mode); |
| 187 | 187 | ||
| 188 | if (inf->power_budget) | ||
| 189 | hcd->power_budget = inf->power_budget; | ||
| 190 | |||
| 188 | ohci_hcd_init(hcd_to_ohci(hcd)); | 191 | ohci_hcd_init(hcd_to_ohci(hcd)); |
| 189 | 192 | ||
| 190 | retval = usb_add_hcd(hcd, pdev->resource[1].start, SA_INTERRUPT); | 193 | retval = usb_add_hcd(hcd, pdev->resource[1].start, SA_INTERRUPT); |