Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk@flint.arm.linux.org.uk>2004-02-14 18:36:01 +0000
committerRussell King <rmk@flint.arm.linux.org.uk>2004-02-14 18:36:01 +0000
commita9060701aec84305db933a6caeae1ee6d2c3afe8 (patch)
treebf5b3edb560b0844c488fd53f82a6b06528f53b6
parentd1c0dfc84a8d1a97db4bf3fc5f67c0fa6e6cd5ec (diff)
[ARM] Fix couple of compiler warnings:
arch/arm/kernel/time.c: Fix time_before type warning. arch/arm/common/amba.c: Fix snprintf compiler warning.
-rw-r--r--arch/arm/common/amba.c2
-rw-r--r--arch/arm/kernel/time.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/common/amba.c b/arch/arm/common/amba.c
index cdfc26e27e01..46abe4cc4351 100644
--- a/arch/arm/common/amba.c
+++ b/arch/arm/common/amba.c
@@ -50,7 +50,7 @@ static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf,
if (nr_env < 2)
return -ENOMEM;
- snprintf(buf, bufsz, "AMBA_ID=%08lx", pcdev->periphid);
+ snprintf(buf, bufsz, "AMBA_ID=%08x", pcdev->periphid);
*envp++ = buf;
*envp++ = NULL;
return 0;
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index c9547904a09d..150f590bcf81 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -116,7 +116,7 @@ static inline void do_set_rtc(void)
return;
if (next_rtc_update &&
- time_before(xtime.tv_sec, next_rtc_update))
+ time_before((unsigned long)xtime.tv_sec, next_rtc_update))
return;
if (xtime.tv_nsec < 500000000 - ((unsigned) tick_nsec >> 1) &&