diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-14 08:00:30 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-14 08:00:30 (GMT) |
| commit | 6ee5859df5baabb82014573d126b9fd790c3a9d8 (patch) | |
| tree | c0709418742dee58c8b2e0ba2619a3149d4a685d /drivers/rtc/rtc-msm6242.c | |
| parent | 55835eb62fad1253c9e657a667549945e4be9759 (diff) | |
| parent | d8ce1481ee8770ef2314eb7984a2228dbf64ad06 (diff) | |
| download | linux-fsl-qoriq-6ee5859df5baabb82014573d126b9fd790c3a9d8.tar.xz | |
Merge branch 'fortglx/2.6.38/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux into timers/urgent
Diffstat (limited to 'drivers/rtc/rtc-msm6242.c')
| -rw-r--r-- | drivers/rtc/rtc-msm6242.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-msm6242.c b/drivers/rtc/rtc-msm6242.c index b2fff0c..6782062 100644 --- a/drivers/rtc/rtc-msm6242.c +++ b/drivers/rtc/rtc-msm6242.c @@ -82,7 +82,7 @@ static inline unsigned int msm6242_read(struct msm6242_priv *priv, static inline void msm6242_write(struct msm6242_priv *priv, unsigned int val, unsigned int reg) { - return __raw_writel(val, &priv->regs[reg]); + __raw_writel(val, &priv->regs[reg]); } static inline void msm6242_set(struct msm6242_priv *priv, unsigned int val, |