diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-09 14:32:05 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-09 14:32:05 +1100 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /arch/powerpc/platforms/powermac/smp.c | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
| download | blackbird-obmc-linux-516450179454de9e689e0a53ed8f34b896e8651c.tar.gz blackbird-obmc-linux-516450179454de9e689e0a53ed8f34b896e8651c.zip | |
Merge ../linux-2.6
Diffstat (limited to 'arch/powerpc/platforms/powermac/smp.c')
| -rw-r--r-- | arch/powerpc/platforms/powermac/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c index 0df2cdcd805c..6d64a9bf3474 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c @@ -435,7 +435,7 @@ struct smp_ops_t psurge_smp_ops = { */ static void (*pmac_tb_freeze)(int freeze); -static unsigned long timebase; +static u64 timebase; static int tb_req; static void smp_core99_give_timebase(void) |
