projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
drivers
/
rtc
/
x1205.c
diff --git
a/drivers/rtc/x1205.c
b/drivers/rtc/x1205.c
index
0e18139
..
7025cf4
100644
(file)
--- a/
drivers/rtc/x1205.c
+++ b/
drivers/rtc/x1205.c
@@
-40,7
+40,7
@@
#include <i2c.h>
#include <bcd.h>
-#if defined(CONFIG_
RTC_X1205) && defined(CONFIG_
CMD_DATE)
+#if defined(CONFIG_CMD_DATE)
#define CCR_SEC 0
#define CCR_MIN 1