diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-23 15:12:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-23 15:13:11 +0200 |
| commit | 9d54b6f6b6c42b7078ba8619444089507a0563f3 (patch) | |
| tree | 4a704b9529f2b5e9e19e264c1bb1fb2df9b634fe /include | |
| parent | 4d90f44e6ed2f40081ffa7cfbd2d78fc85d44436 (diff) | |
| download | barebox-9d54b6f6b6c42b7078ba8619444089507a0563f3.tar.gz barebox-9d54b6f6b6c42b7078ba8619444089507a0563f3.tar.xz | |
clock: remove duplicate xdelay declarations
ndelay is declared in include/clock.h, udelay in include/common.h and
mdelay in include/common.h and include/clock.h. Move them all to
include/clock.h and remove duplicates.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/clock.h | 3 | ||||
| -rw-r--r-- | include/common.h | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/clock.h b/include/clock.h index 691befc2e2..681e3ad888 100644 --- a/include/clock.h +++ b/include/clock.h @@ -34,9 +34,8 @@ uint32_t clocksource_hz2mult(uint32_t hz, uint32_t shift_constant); int is_timeout(uint64_t start_ns, uint64_t time_offset_ns); int is_timeout_non_interruptible(uint64_t start_ns, uint64_t time_offset_ns); -// void udelay(unsigned long usecs); - void ndelay(unsigned long nsecs); +void udelay(unsigned long usecs); void mdelay(unsigned long msecs); #define SECOND ((uint64_t)(1000 * 1000 * 1000)) diff --git a/include/common.h b/include/common.h index 553a7f4f44..03ceec257d 100644 --- a/include/common.h +++ b/include/common.h @@ -23,6 +23,7 @@ #include <stdio.h> #include <module.h> #include <config.h> +#include <clock.h> #include <linux/bitops.h> #include <linux/types.h> #include <linux/string.h> @@ -69,10 +70,6 @@ long get_ram_size (volatile long *, long); /* $(CPU)/cpu.c */ void __noreturn poweroff(void); -/* lib_$(ARCH)/time.c */ -void udelay (unsigned long); -void mdelay (unsigned long); - /* lib_generic/crc32.c */ uint32_t crc32(uint32_t, const void*, unsigned int); uint32_t crc32_no_comp(uint32_t, const void*, unsigned int); |