diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-12 17:05:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-12 17:05:41 -0500 |
| commit | 87c9e117bf57d6bb42c5521a3f6ec9ca7d97e5fa (patch) | |
| tree | 9a2a90d475abd35c8945bb3af7aa0c14bfc149f7 /lib | |
| parent | f58885d002302b8047446a6a15f7376bb7b1ea32 (diff) | |
| parent | 48b3ecbedf8208845ac5956a3fb8817269fafedd (diff) | |
Merge branch '2023-01-12-further-assorted-general-updates'
- Bring in a number of assorted updates, some of which have been waiting
around for a bit. Make silent console really be silent, get rid of
gpio_hog_probe_all, add RNG for imx6, make net/fm use fs_loader, get
rid of a bad __weak usage and set distro_bootpart_uuid in another case.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/time.c b/lib/time.c index 82350260ea..0c95d12f61 100644 --- a/lib/time.c +++ b/lib/time.c @@ -63,7 +63,7 @@ ulong timer_get_boot_us(void) } #else -extern unsigned long __weak timer_read_counter(void); +extern unsigned long timer_read_counter(void); #endif #if CONFIG_IS_ENABLED(TIMER) |