diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-13 10:02:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-13 10:02:43 -0500 |
| commit | b67dfc5a1099eef2a323de23a78ba4e6d9b87633 (patch) | |
| tree | e23ed37c2736481bd5cbf58f4d8aab57381005e9 /arch/x86/lib/tsc_timer.c | |
| parent | 439fcb9b4f717f5a583014acb3e75b789564867c (diff) | |
| parent | 6d41027fe2e734aa1e15fabc1523417b3b871691 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/tsc_timer.c')
| -rw-r--r-- | arch/x86/lib/tsc_timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c index 0df1af238c..e02b918843 100644 --- a/arch/x86/lib/tsc_timer.c +++ b/arch/x86/lib/tsc_timer.c @@ -368,9 +368,9 @@ void __udelay(unsigned long usec) int timer_init(void) { -#ifdef CONFIG_SYS_PCAT_TIMER - /* Set up the PCAT timer if required */ - pcat_timer_init(); +#ifdef CONFIG_I8254_TIMER + /* Set up the i8254 timer if required */ + i8254_init(); #endif return 0; |