diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:07:59 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:07:59 -0700 |
| commit | 9abd59b0df155835a970c2b9c8f93367eb793797 (patch) | |
| tree | bcf0868f831d204e2b582113c53b8de3ff015eca /drivers/rtc/rtc-tegra.c | |
| parent | 4e111751cfcb75f26d2725eab934b6eb91a3d115 (diff) | |
| parent | 94ed5b4788a7cdbe68bc7cb8516972cbebdc8274 (diff) | |
| download | kernel_samsung_aries-9abd59b0df155835a970c2b9c8f93367eb793797.zip kernel_samsung_aries-9abd59b0df155835a970c2b9c8f93367eb793797.tar.gz kernel_samsung_aries-9abd59b0df155835a970c2b9c8f93367eb793797.tar.bz2 | |
Merge commit 'v3.0.1' into android-3.0
Diffstat (limited to 'drivers/rtc/rtc-tegra.c')
| -rw-r--r-- | drivers/rtc/rtc-tegra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c index 2fc31aa..75259fe 100644 --- a/drivers/rtc/rtc-tegra.c +++ b/drivers/rtc/rtc-tegra.c @@ -343,7 +343,7 @@ static int __devinit tegra_rtc_probe(struct platform_device *pdev) /* set context info. */ info->pdev = pdev; - info->tegra_rtc_lock = __SPIN_LOCK_UNLOCKED(info->tegra_rtc_lock); + spin_lock_init(&info->tegra_rtc_lock); platform_set_drvdata(pdev, info); |