diff options
author | Len Brown <len.brown@intel.com> | 2007-02-06 15:31:00 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-06 15:31:00 -0500 |
commit | 57e1c5c87db512629dd44ddeb882a5aaf0e4299e (patch) | |
tree | e71e8a132d4f696beeae1bdab59efeed9517ba66 /drivers/firmware/pcdp.c | |
parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
parent | 76a2e849df47697706024262a8bbb83432b8bde7 (diff) |
Pull test into release branch
Diffstat (limited to 'drivers/firmware/pcdp.c')
-rw-r--r-- | drivers/firmware/pcdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c index c2ad72fefd9d..2b4b76e8bd72 100644 --- a/drivers/firmware/pcdp.c +++ b/drivers/firmware/pcdp.c | |||
@@ -26,7 +26,7 @@ setup_serial_console(struct pcdp_uart *uart) | |||
26 | static char options[64], *p = options; | 26 | static char options[64], *p = options; |
27 | char parity; | 27 | char parity; |
28 | 28 | ||
29 | mmio = (uart->addr.address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY); | 29 | mmio = (uart->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY); |
30 | p += sprintf(p, "console=uart,%s,0x%lx", | 30 | p += sprintf(p, "console=uart,%s,0x%lx", |
31 | mmio ? "mmio" : "io", uart->addr.address); | 31 | mmio ? "mmio" : "io", uart->addr.address); |
32 | if (uart->baud) { | 32 | if (uart->baud) { |