diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2013-01-12 21:25:51 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2013-06-10 11:42:11 +0200 |
| commit | 01ab25d50c6d5e1a0e82f9053e03b86b9fa757c8 (patch) | |
| tree | c88a9bda8f30479116166f00aac5925ea9db90e1 /drivers | |
| parent | 3ed9fdb7ac17e98f8501bcbcf78d5374a929ef0e (diff) | |
Revert "pcdp: use early_ioremap/early_iounmap to access pcdp table"
This reverts commit 2af3af56e7d4756b21a2e0d86e4fc4e5b7f0df24, which was
commit 6c4088ac3a4d82779903433bcd5f048c58fb1aca upstream.
This broke compilation of the driver in 2.6.32.y as the
early_io{remap,unmap}() functions are not defined for ia64. The driver
can *only* be built for ia64 (even in current mainline), so a fix for
x86_64 is pointless.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/pcdp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c index a330492e06f9..51e0e2d8fac6 100644 --- a/drivers/firmware/pcdp.c +++ b/drivers/firmware/pcdp.c @@ -95,7 +95,7 @@ efi_setup_pcdp_console(char *cmdline) if (efi.hcdp == EFI_INVALID_TABLE_ADDR) return -ENODEV; - pcdp = early_ioremap(efi.hcdp, 4096); + pcdp = ioremap(efi.hcdp, 4096); printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, efi.hcdp); if (strstr(cmdline, "console=hcdp")) { @@ -131,6 +131,6 @@ efi_setup_pcdp_console(char *cmdline) } out: - early_iounmap(pcdp, 4096); + iounmap(pcdp); return rc; } |