diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 00:52:34 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 00:52:34 -0400 |
| commit | baea90ea14b316e4599f000c713e446908a5aef6 (patch) | |
| tree | 17eae40f15832b466121d8f962028472c4568a13 /drivers/usb/gadget/fsl_mxc_udc.c | |
| parent | 36239c6704b71da7fb8e2a9429e159a84d0c5a3e (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/gadget/fsl_mxc_udc.c')
| -rw-r--r-- | drivers/usb/gadget/fsl_mxc_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c index d0b8bde59e59..eafa6d2c5ed7 100644 --- a/drivers/usb/gadget/fsl_mxc_udc.c +++ b/drivers/usb/gadget/fsl_mxc_udc.c | |||
| @@ -30,7 +30,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) | |||
| 30 | 30 | ||
| 31 | pdata = pdev->dev.platform_data; | 31 | pdata = pdev->dev.platform_data; |
| 32 | 32 | ||
| 33 | if (!cpu_is_mx35()) { | 33 | if (!cpu_is_mx35() && !cpu_is_mx25()) { |
| 34 | mxc_ahb_clk = clk_get(&pdev->dev, "usb_ahb"); | 34 | mxc_ahb_clk = clk_get(&pdev->dev, "usb_ahb"); |
| 35 | if (IS_ERR(mxc_ahb_clk)) | 35 | if (IS_ERR(mxc_ahb_clk)) |
| 36 | return PTR_ERR(mxc_ahb_clk); | 36 | return PTR_ERR(mxc_ahb_clk); |