Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299119
b: refs/heads/master
c: 5da527a
h: refs/heads/master
i:
  299117: f1fb35f
  299115: 8cecf73
  299111: 74b0baf
  299103: 60e18ed
v: v3
  • Loading branch information
Kay Sievers authored and Greg Kroah-Hartman committed Apr 9, 2012
1 parent a3bd304 commit c3b4030
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 57c3686842114de3b0c00633591e9605c46fb769
refs/heads/master: 5da527aafed2834852fc4fe21daeaeadf7c61af3
4 changes: 2 additions & 2 deletions trunk/drivers/char/hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/tty/vt/vt.c
Original file line number Diff line number Diff line change
Expand Up @@ -2932,11 +2932,10 @@ static int __init con_init(void)
gotoxy(vc, vc->vc_x, vc->vc_y);
csi_J(vc, 0);
update_screen(vc);
pr_info("Console: %s %s %dx%d",
pr_info("Console: %s %s %dx%d\n",
vc->vc_can_do_color ? "colour" : "mono",
display_desc, vc->vc_cols, vc->vc_rows);
printable = 1;
printk("\n");

console_unlock();

Expand Down

0 comments on commit c3b4030

Please sign in to comment.