diff options
| author | Len Brown <len.brown@intel.com> | 2007-11-20 01:21:47 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-20 01:21:47 -0500 |
| commit | e6532b8883760bdf9d251c669a3919fc9457aeca (patch) | |
| tree | a3e00d9adb1d16b7f7286e365d54de44727ae562 /drivers/acpi/ec.c | |
| parent | d89a9bda14204547f966ed1510a269a44c0b7f5d (diff) | |
| parent | 4fdb2a05ef5703553fdd28f1b96ebdd79f173657 (diff) | |
| download | talos-op-linux-e6532b8883760bdf9d251c669a3919fc9457aeca.tar.gz talos-op-linux-e6532b8883760bdf9d251c669a3919fc9457aeca.zip | |
Pull fluff into release branch
Conflicts:
drivers/acpi/ec.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index d6ddb547f2d9..c5028568058b 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -180,12 +180,12 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll) if (acpi_ec_check_status(ec, event)) { if (test_bit(EC_FLAGS_ADDRESS, &ec->flags)) { /* miss address GPE, don't expect it anymore */ - printk(KERN_INFO PREFIX "missing address confirmation," + printk(KERN_INFO PREFIX "missing address confirmation, " "don't expect it any longer.\n"); set_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags); } else { /* missing GPEs, switch back to poll mode */ - printk(KERN_INFO PREFIX "missing confirmations," + printk(KERN_INFO PREFIX "missing confirmations, " "switch off interrupt mode.\n"); clear_bit(EC_FLAGS_GPE_MODE, &ec->flags); } |
