diff --git a/[refs] b/[refs] index 932d92b4013b..cfb4d5269cb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e32a510afa62c0d548d78572031e6112d21e0ea +refs/heads/master: 2e5dcd2b4ce97ebc43703f2645bf2fe978da1627 diff --git a/trunk/arch/mips/sibyte/bcm1480/time.c b/trunk/arch/mips/sibyte/bcm1480/time.c index bbf19bfabccb..39e77d9bd944 100644 --- a/trunk/arch/mips/sibyte/bcm1480/time.c +++ b/trunk/arch/mips/sibyte/bcm1480/time.c @@ -116,7 +116,7 @@ void __cpuinit sb1480_clockevent_init(void) BUG_ON(cpu > 3); /* Only have 4 general purpose timers */ - sprintf(name, "bcm1480-counter %d", cpu); + sprintf(name, "bcm1480-counter-%d", cpu); cd->name = name; cd->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; diff --git a/trunk/arch/mips/sibyte/sb1250/time.c b/trunk/arch/mips/sibyte/sb1250/time.c index 95ad34e3fbac..7f1316dd8add 100644 --- a/trunk/arch/mips/sibyte/sb1250/time.c +++ b/trunk/arch/mips/sibyte/sb1250/time.c @@ -134,7 +134,7 @@ void __cpuinit sb1250_clockevent_init(void) /* Only have 4 general purpose timers, and we use last one as hpt */ BUG_ON(cpu > 2); - sprintf(name, "bcm1480-counter %d", cpu); + sprintf(name, "sb1250-counter-%d", cpu); cd->name = name; cd->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;