diff options
| author | Jin Qian <jqian@nvidia.com> | 2011-01-04 12:30:16 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:42:04 -0800 |
| commit | 0a35c3362060e8630917f00dfc1be5e977b57897 (patch) | |
| tree | e471fe3445af2e1c48c51c373643a37d0a168405 /arch/arm/mach-tegra/clock.c | |
| parent | f3bc2808faa39dacfd49ba2b876f9939c9e89286 (diff) | |
Merge remote branch 'remotes/git-master/android-tegra-2.6.36' into 0104-merge
Conflicts:
arch/arm/configs/tegra_defconfig
arch/arm/configs/tegra_whistler_android_defconfig
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-ventana.c
arch/arm/mach-tegra/board-ventana.h
arch/arm/mach-tegra/board-whistler-power.c
arch/arm/mach-tegra/board-whistler.c
arch/arm/mach-tegra/clock.c
arch/arm/mach-tegra/clock.h
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/cpu-tegra.c
arch/arm/mach-tegra/dma.c
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/headsmp.S
arch/arm/mach-tegra/include/mach/iomap.h
arch/arm/mach-tegra/irq.c
arch/arm/mach-tegra/spi_tegra_slave.c
arch/arm/mach-tegra/tegra2_clocks.c
arch/arm/mach-tegra/tegra2_dvfs.c
arch/arm/tools/mach-types
drivers/crypto/tegra-aes.c
drivers/rtc/rtc-tegra.c
drivers/video/tegra/host/dev.c
drivers/video/tegra/host/nvhost_acm.c
drivers/video/tegra/host/nvhost_channel.c
drivers/video/tegra/host/nvhost_intr.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_pcm.c
Original-Change-Id: If13d61cce097ee90892132e775c5ac805a1f91e0
Reviewed-on: http://git-master/r/14922
Tested-by: Jin Qian <jqian@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Original-Change-Id: Id331a2ef77522766e5b7f86131c6c981b37ba4c8
Rebase-Id: R0a3bf55c838f202bc5469df6b497748670e7ff09
Diffstat (limited to 'arch/arm/mach-tegra/clock.c')
| -rw-r--r-- | arch/arm/mach-tegra/clock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c index 7203486ac834..ed6fd0697896 100644 --- a/arch/arm/mach-tegra/clock.c +++ b/arch/arm/mach-tegra/clock.c @@ -517,7 +517,10 @@ void tegra_sdmmc_tap_delay(struct clk *c, int delay) unsigned long flags; clk_lock_save(c, &flags); + /* !!FIXME!! add t30 support */ +#ifdef CONFIG_ARCH_TEGRA_2x_SOC tegra2_sdmmc_tap_delay(c, delay); +#endif clk_unlock_restore(c, &flags); } |