aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/ec.c4
-rw-r--r--drivers/acpi/processor_core.c2
-rw-r--r--drivers/acpi/tables/tbutils.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 06b78e5e33a1..cb09e5e03400 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -175,12 +175,12 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
175 if (acpi_ec_check_status(ec, event)) { 175 if (acpi_ec_check_status(ec, event)) {
176 if (event == ACPI_EC_EVENT_OBF_1) { 176 if (event == ACPI_EC_EVENT_OBF_1) {
177 /* miss OBF = 1 GPE, don't expect it anymore */ 177 /* miss OBF = 1 GPE, don't expect it anymore */
178 printk(KERN_INFO PREFIX "missing OBF_1 confirmation," 178 printk(KERN_INFO PREFIX "missing OBF_1 confirmation, "
179 "switching to degraded mode.\n"); 179 "switching to degraded mode.\n");
180 set_bit(EC_FLAGS_ONLY_IBF_GPE, &ec->flags); 180 set_bit(EC_FLAGS_ONLY_IBF_GPE, &ec->flags);
181 } else { 181 } else {
182 /* missing GPEs, switch back to poll mode */ 182 /* missing GPEs, switch back to poll mode */
183 printk(KERN_INFO PREFIX "missing IBF_1 confirmations," 183 printk(KERN_INFO PREFIX "missing IBF_1 confirmations, "
184 "switch off interrupt mode.\n"); 184 "switch off interrupt mode.\n");
185 clear_bit(EC_FLAGS_GPE_MODE, &ec->flags); 185 clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
186 } 186 }
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 235a51e328c3..44156e73de61 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -647,7 +647,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
647 */ 647 */
648 if (processor_device_array[pr->id] != NULL && 648 if (processor_device_array[pr->id] != NULL &&
649 processor_device_array[pr->id] != device) { 649 processor_device_array[pr->id] != device) {
650 printk(KERN_WARNING "BIOS reported wrong ACPI id" 650 printk(KERN_WARNING "BIOS reported wrong ACPI id "
651 "for the processor\n"); 651 "for the processor\n");
652 return -ENODEV; 652 return -ENODEV;
653 } 653 }
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 5f1d85f2ffe4..010f19652f80 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -449,7 +449,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
449 /* XSDT has NULL entry, RSDT is used */ 449 /* XSDT has NULL entry, RSDT is used */
450 address = rsdt_address; 450 address = rsdt_address;
451 table_entry_size = sizeof(u32); 451 table_entry_size = sizeof(u32);
452 ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry," 452 ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry, "
453 "using RSDT")); 453 "using RSDT"));
454 } 454 }
455 } 455 }