diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 13:45:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 13:45:41 -0700 |
| commit | 37b0d1dedcedf555e2940bc7702c11e2b572299f (patch) | |
| tree | ce0b69ccd8f147d5eb7c4d75d45dbb67b4a4ff0a /drivers | |
| parent | d374c1c1281d6188a0d0676172b1c0e3de35c6e7 (diff) | |
| parent | 56f1319e877a969b814b3805c77ea9c31d849f54 (diff) | |
| download | kernel-crypto-37b0d1dedcedf555e2940bc7702c11e2b572299f.tar.gz kernel-crypto-37b0d1dedcedf555e2940bc7702c11e2b572299f.tar.xz kernel-crypto-37b0d1dedcedf555e2940bc7702c11e2b572299f.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix Integrator and Versatile interrupt initialisation
[ARM] 3546/1: PATCH: subtle lost interrupts bug on i.MX
[ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget
[ARM] Fix Neponset IRQ handling
Diffstat (limited to 'drivers')
| -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 /* Select Power Management Mode */ pxa27x_ohci_select_pmm(inf->port_mode); + if (inf->power_budget) + hcd->power_budget = inf->power_budget; + ohci_hcd_init(hcd_to_ohci(hcd)); retval = usb_add_hcd(hcd, pdev->resource[1].start, SA_INTERRUPT); |