diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /drivers/firmware/pcdp.c | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
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) { |