diff --git a/[refs] b/[refs] index 24857e063c1e..f03ebb5055a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7e9f6219d01ccb4af6fe5ad082150032ecae8ab +refs/heads/master: 586f64c749a71fa2c86e1e2c121d22c8bc60669a diff --git a/trunk/arch/sparc/kernel/leon_kernel.c b/trunk/arch/sparc/kernel/leon_kernel.c index 554e0b80bcde..87f1760c0aa2 100644 --- a/trunk/arch/sparc/kernel/leon_kernel.c +++ b/trunk/arch/sparc/kernel/leon_kernel.c @@ -124,7 +124,7 @@ void __init leon_init_timers(irq_handler_t counter_fn) if (!(LEON3_BYPASS_LOAD_PA(&leon3_gptimer_regs->config) & (1<