Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / common / cmd_date.c

diff --git a/common/cmd_date.c b/common/cmd_date.c
index 3141a3968aebaf27cd4a3e55eca39f07cb97508c..8dbf16d32a1220772427fbbb133a8c9fd0282aba 100644 (file)
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -35,15 +35,15 @@ const char *weekdays[] = {
        "Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur",
 };
 
-#ifdef CONFIG_RELOC_FIXUP_WORKS
-#define RELOC(a)       a
-#else
+#ifdef CONFIG_NEEDS_MANUAL_RELOC
 #define RELOC(a)       ((typeof(a))((unsigned long)(a) + gd->reloc_off))
+#else
+#define RELOC(a)       a
 #endif
 
 int mk_date (char *, struct rtc_time *);
 
-int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        struct rtc_time tm;
        int rcode = 0;