Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 319871
b: refs/heads/master
c: 6c4088a
h: refs/heads/master
i:
  319869: 8211003
  319867: 6d15557
  319863: fa9c61c
  319855: 9fc9b47
  319839: 3548b46
  319807: 27655db
  319743: e5137e7
v: v3
  • Loading branch information
Greg Pearson authored and Linus Torvalds committed Jul 31, 2012
1 parent 8578dbe commit d1f6efd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: dc32f63453f56d07a1073a697dcd843dd3098c09
refs/heads/master: 6c4088ac3a4d82779903433bcd5f048c58fb1aca
4 changes: 2 additions & 2 deletions trunk/drivers/firmware/pcdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ efi_setup_pcdp_console(char *cmdline)
if (efi.hcdp == EFI_INVALID_TABLE_ADDR)
return -ENODEV;

pcdp = ioremap(efi.hcdp, 4096);
pcdp = early_ioremap(efi.hcdp, 4096);
printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, efi.hcdp);

if (strstr(cmdline, "console=hcdp")) {
Expand Down Expand Up @@ -131,6 +131,6 @@ efi_setup_pcdp_console(char *cmdline)
}

out:
iounmap(pcdp);
early_iounmap(pcdp, 4096);
return rc;
}

0 comments on commit d1f6efd

Please sign in to comment.