diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
| commit | e902be56cbf2a48d96d11d6884767e638d41c712 (patch) | |
| tree | e4d79479a1280ad4841005680e37119d6694c3bf /drivers/usb/host/ohci-pxa27x.c | |
| parent | c750815e2d436f4379c7af8a8770ef2ae71c5607 (diff) | |
| parent | 5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff) | |
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'drivers/usb/host/ohci-pxa27x.c')
| -rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index e294d430733b..e44dc2cbca24 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
| @@ -296,7 +296,7 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device | |||
| 296 | return -ENXIO; | 296 | return -ENXIO; |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | usb_clk = clk_get(&pdev->dev, "USBCLK"); | 299 | usb_clk = clk_get(&pdev->dev, NULL); |
| 300 | if (IS_ERR(usb_clk)) | 300 | if (IS_ERR(usb_clk)) |
| 301 | return PTR_ERR(usb_clk); | 301 | return PTR_ERR(usb_clk); |
| 302 | 302 | ||