diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-14 14:43:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-14 14:43:40 +0200 |
| commit | 9cba26e66d09bf394ae5a739627a1dc8b7cae6f4 (patch) | |
| tree | f03743d576a0c7826b9921ad47e70370ebe80a22 /drivers/char/hpet.c | |
| parent | ec83db0f78cd44c3b586ec1c3a348d1a8a389797 (diff) | |
| parent | 73eff9f56e15598c8399c0b86899fd889b97f085 (diff) | |
Merge branch 'perf/uprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/uprobes
Diffstat (limited to 'drivers/char/hpet.c')
| -rw-r--r-- | drivers/char/hpet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 3845ab44c33..dfd7876f127 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -906,8 +906,8 @@ int hpet_alloc(struct hpet_data *hdp) hpetp->hp_which, hdp->hd_phys_address, hpetp->hp_ntimer > 1 ? "s" : ""); for (i = 0; i < hpetp->hp_ntimer; i++) - printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]); - printk("\n"); + printk(KERN_CONT "%s %d", i > 0 ? "," : "", hdp->hd_irq[i]); + printk(KERN_CONT "\n"); temp = hpetp->hp_tick_freq; remainder = do_div(temp, 1000000); |