Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI: Add DMI entry for Sony VGN-FW41E_H
  ACPI: fix obsolete comment in custom_method.c
  ACPI / thermal: Use mode to enable/disable kernel thermal processing
  ACPI thermal: remove unnecessary newline from exception message
  ACPI sysfs: remove unnecessary newline from exception
  ACPI video: remove unnecessary newline from error messages
  ACPI: SRAT: report non-volatile memory in debug
  ACPI: Rework acpi_get_child() to be more efficient

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 5be60ad8381f..313f959413dc 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -673,7 +673,7 @@ acpi_video_init_brightness(struct acpi_video_device *device)
                         br->levels[i] = br->levels[i - level_ac_battery];
                 count += level_ac_battery;
         } else if (level_ac_battery > 2)
-                ACPI_ERROR((AE_INFO, "Too many duplicates in _BCL package\n"));
+                ACPI_ERROR((AE_INFO, "Too many duplicates in _BCL package"));
 
         /* Check if the _BCL package is in a reversed order */
         if (max_level == br->levels[2]) {
@@ -682,7 +682,7 @@ acpi_video_init_brightness(struct acpi_video_device *device)
                         acpi_video_cmp_level, NULL);
         } else if (max_level != br->levels[count - 1])
                 ACPI_ERROR((AE_INFO,
-                            "Found unordered _BCL package\n"));
+                            "Found unordered _BCL package"));
 
         br->count = count;
         device->brightness = br;