xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

Browse Source
This commit is contained in:
Russell King
2010-07-29 15:48:37 +01:00
parent 129961ecaf 79d3c2c239
commit d50f58bbd9
158 changed files with 6209 additions and 2940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/host/ehci-mxc.c
View File

@@ -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);