diff options
| author | Jin Qian <jqian@nvidia.com> | 2010-12-29 17:35:51 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:43:14 -0800 |
| commit | 830f92f2890d43df8333a3cc90b8e86a81672c12 (patch) | |
| tree | e1ada7581fd0009806ef718787d4afbb7abe132e | |
| parent | 355972d0cc83c04ccc1d0c8287c450dabcfd05a6 (diff) | |
Merge remote branch 'git-master/android-tegra-2.6.36' into merge-android
Conflicts:
arch/arm/configs/tegra_defconfig
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-ventana-power.c
arch/arm/mach-tegra/board-ventana-sensors.c
arch/arm/mach-tegra/board-ventana.c
arch/arm/mach-tegra/clock.c
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/cpu-tegra.c
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/headsmp.S
arch/arm/mach-tegra/tegra2_dvfs.c
arch/arm/tools/mach-types
drivers/rtc/rtc-tegra.c
drivers/usb/gadget/fsl_udc_core.c
drivers/video/tegra/host/dev.c
drivers/video/tegra/host/nvhost_channel.c
drivers/video/tegra/host/nvhost_intr.c
Original-Change-Id: I1e9b6d0e761cf1e95cf90b78b5932b53fcb9bb5e
(cherry picked from commit 2f331e046f7c4cfc6ab54fca3193035b3bf3a14f)
Reviewed-on: http://git-master/r/14572
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Original-Change-Id: I29db8796b2e27a8d218c332de36f880a7cf4bcb2
Rebase-Id: R0da39c9e0c8fa198550e0abe93658d4d9ce8f86c
| -rw-r--r-- | drivers/rtc/rtc-tegra.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c index 361d55454f9f..febedf6d5cf1 100644 --- a/drivers/rtc/rtc-tegra.c +++ b/drivers/rtc/rtc-tegra.c @@ -498,8 +498,10 @@ static struct platform_driver tegra_rtc_driver = { .name = "tegra_rtc", .owner = THIS_MODULE, }, +#ifdef CONFIG_PM .suspend = tegra_rtc_suspend, .resume = tegra_rtc_resume, +#endif }; static int __init tegra_rtc_init(void) |