diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-04 17:08:18 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-04 17:08:18 +0530 |
| commit | b6b1f33f279fcb1c4a751f981153affa6469e94c (patch) | |
| tree | a77ace4c91f29d814982c40bea8c4a172af9ee3e /drivers/usb/gadget/fsl_tegra_udc.c | |
| parent | df4a2fbff8471de3f75d55b93e2bf94dfd26ff7e (diff) | |
| parent | a979d00287bcd3297bd13a59534073e6faa570c9 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/include/mach/dc.h
drivers/video/tegra/dc/hdmi.c
drivers/video/tegra/host/nvhost_acm.c
Change-Id: Iddf74984cc02f08dca3738967c0580ba7c375337
Diffstat (limited to 'drivers/usb/gadget/fsl_tegra_udc.c')
| -rw-r--r-- | drivers/usb/gadget/fsl_tegra_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/fsl_tegra_udc.c b/drivers/usb/gadget/fsl_tegra_udc.c index 74c1d0b52541..14e62f40a50a 100644 --- a/drivers/usb/gadget/fsl_tegra_udc.c +++ b/drivers/usb/gadget/fsl_tegra_udc.c @@ -42,7 +42,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) } clk_enable(emc_clk); - clk_set_rate(emc_clk, 240000000); + clk_set_rate(emc_clk, 400000000); /* we have to remap the registers ourselves as fsl_udc does not * export them for us. |