projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
rtc
/
rtc-armada38x.c
diff --git
a/drivers/rtc/rtc-armada38x.c
b/drivers/rtc/rtc-armada38x.c
index 4b62d1a875e43eb09bf4631f7695f31dda9bfa6d..2b08cac62f07a5c6fed07b0598025234befe2c18 100644
(file)
--- a/
drivers/rtc/rtc-armada38x.c
+++ b/
drivers/rtc/rtc-armada38x.c
@@
-88,7
+88,7
@@
static int armada38x_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
struct armada38x_rtc *rtc = dev_get_drvdata(dev);
int ret = 0;
- unsigned long time
, flags
;
+ unsigned long time;
ret = rtc_tm_to_time(tm, &time);