projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
[cascardo/linux.git]
/
drivers
/
usb
/
host
/
ehci-mxc.c
diff --git
a/drivers/usb/host/ehci-mxc.c
b/drivers/usb/host/ehci-mxc.c
index
bd40277
..
a8ad8ac
100644
(file)
--- a/
drivers/usb/host/ehci-mxc.c
+++ b/
drivers/usb/host/ehci-mxc.c
@@
-182,7
+182,7
@@
static int ehci_mxc_drv_probe(struct platform_device *pdev)
}
clk_enable(priv->usbclk);
- if (!cpu_is_mx35()) {
+ if (!cpu_is_mx35()
&& !cpu_is_mx25()
) {
priv->ahbclk = clk_get(dev, "usb_ahb");
if (IS_ERR(priv->ahbclk)) {
ret = PTR_ERR(priv->ahbclk);