diff options
Diffstat (limited to 'arch/um/kernel/time.c')
| -rw-r--r-- | arch/um/kernel/time.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 0b034ebbda2a..7f69d17de354 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -98,7 +98,7 @@ static struct clocksource timer_clocksource = {  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,  }; -static void __init timer_setup(void) +static void __init um_timer_setup(void)  {  	int err; @@ -132,5 +132,5 @@ void read_persistent_clock(struct timespec *ts)  void __init time_init(void)  {  	timer_set_signal_handler(); -	late_time_init = timer_setup; +	late_time_init = um_timer_setup;  } |