Merge branch 'next' of git://git.denx.de/u-boot-avr32

[u-boot] / drivers / rtc / ds12887.c

diff --git a/drivers/rtc/ds12887.c b/drivers/rtc/ds12887.c
index 57a446d3051e2102b7a31391c344b6a402145b05..fb1825bf15c997491c32b3122c77674e33a6eefe 100644 (file)
--- a/drivers/rtc/ds12887.c
+++ b/drivers/rtc/ds12887.c
@@ -28,21 +28,21 @@
 #include <config.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_DS12887) && defined(CONFIG_CMD_DATE)
+#if defined(CONFIG_CMD_DATE)
 
 #define RTC_SECONDS                    0x00
 #define RTC_SECONDS_ALARM              0x01
 #define RTC_MINUTES                    0x02
 #define RTC_MINUTES_ALARM              0x03
 #define RTC_HOURS                      0x04
-#define RTC_HOURS_ALARM                0x05
-#define RTC_DAY_OF_WEEK                0x06
+#define RTC_HOURS_ALARM                        0x05
+#define RTC_DAY_OF_WEEK                        0x06
 #define RTC_DATE_OF_MONTH              0x07
 #define RTC_MONTH                      0x08
 #define RTC_YEAR                       0x09
-#define RTC_CONTROL_A                  0x0A
-#define RTC_CONTROL_B                  0x0B
-#define RTC_CONTROL_C                  0x0C
+#define RTC_CONTROL_A                  0x0A
+#define RTC_CONTROL_B                  0x0B
+#define RTC_CONTROL_C                  0x0C
 #define RTC_CONTROL_D                  0x0D
 
 #define RTC_CA_UIP                     0x80