diff options
| author | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
| commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
| tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /drivers/firmware | |
| parent | d186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff) | |
| parent | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff) | |
Pull for-2.6.31 into release
Diffstat (limited to 'drivers/firmware')
| -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 58e9f8e457f8..51e0e2d8fac6 100644 --- a/drivers/firmware/pcdp.c +++ b/drivers/firmware/pcdp.c | |||
| @@ -28,10 +28,10 @@ setup_serial_console(struct pcdp_uart *uart) | |||
| 28 | char parity; | 28 | char parity; |
| 29 | 29 | ||
| 30 | mmio = (uart->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY); | 30 | mmio = (uart->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY); |
| 31 | p += sprintf(p, "uart8250,%s,0x%lx", | 31 | p += sprintf(p, "uart8250,%s,0x%llx", |
| 32 | mmio ? "mmio" : "io", uart->addr.address); | 32 | mmio ? "mmio" : "io", uart->addr.address); |
| 33 | if (uart->baud) { | 33 | if (uart->baud) { |
| 34 | p += sprintf(p, ",%lu", uart->baud); | 34 | p += sprintf(p, ",%llu", uart->baud); |
| 35 | if (uart->bits) { | 35 | if (uart->bits) { |
| 36 | switch (uart->parity) { | 36 | switch (uart->parity) { |
| 37 | case 0x2: parity = 'e'; break; | 37 | case 0x2: parity = 'e'; break; |