From db7d4daea91e105e3859cf461d7e53b9b77454b2 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sun, 13 Jun 1999 16:29:25 +0000 Subject: Merge with Linux 2.2.8. --- include/asm-sparc/timer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/asm-sparc/timer.h') diff --git a/include/asm-sparc/timer.h b/include/asm-sparc/timer.h index 843ff4b7c..226937aca 100644 --- a/include/asm-sparc/timer.h +++ b/include/asm-sparc/timer.h @@ -1,4 +1,4 @@ -/* $Id: timer.h,v 1.20 1998/09/21 05:07:37 jj Exp $ +/* $Id: timer.h,v 1.21 1999/04/20 13:22:51 anton Exp $ * timer.h: Definitions for the timer chips on the Sparc. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -9,7 +9,7 @@ #ifndef _SPARC_TIMER_H #define _SPARC_TIMER_H -#include /* For NCPUS */ +#include /* For SUN4M_NCPUS */ #include #include @@ -70,7 +70,7 @@ struct sun4m_timer_percpu_info { }; struct sun4m_timer_regs { - struct sun4m_timer_percpu_info cpu_timers[NCPUS]; + struct sun4m_timer_percpu_info cpu_timers[SUN4M_NCPUS]; volatile unsigned int l10_timer_limit; volatile unsigned int l10_cur_count; -- cgit v1.2.3