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:43:14 -0800 |
| commit | 552716d653b7c18b1aa45d8d8af127b46f585451 (patch) | |
| tree | 5e1e8cc9acb392c97eeb46bd007fd6c60ba3cf83 /drivers/rtc/rtc-tegra.c | |
| parent | 830f92f2890d43df8333a3cc90b8e86a81672c12 (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: R50699fd7a447ef849a58da9e207045b5d4da3eb7
Diffstat (limited to 'drivers/rtc/rtc-tegra.c')
| -rw-r--r-- | drivers/rtc/rtc-tegra.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c index febedf6d5cf1..3347eb71dea3 100644 --- a/drivers/rtc/rtc-tegra.c +++ b/drivers/rtc/rtc-tegra.c @@ -479,9 +479,6 @@ static int tegra_rtc_resume(struct platform_device *pdev) return 0; } -#else -#define tegra_rtc_suspend NULL -#define tegra_rtc_resume NULL #endif static void tegra_rtc_shutdown(struct platform_device *pdev) |