Merge branches 'acpi-utils', 'acpi-video', 'acpi-soc' and 'acpi-button'

[sfrench/cifs-2.6.git] / drivers / acpi / video_detect.c

diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 0e0a3929e34e25112f0822bf70244962195598e7..31014c7d3793906be9ee4eeba48c48f199a7f57d 100644 (file)
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -112,7 +112,7 @@ static int video_detect_force_none(const struct dmi_system_id *d)
 static const struct dmi_system_id video_detect_dmi_table[] = {
        /* On Samsung X360, the BIOS will set a flag (VDRV) if generic
         * ACPI backlight device is used. This flag will definitively break
-        * the backlight interface (even the vendor interface) untill next
+        * the backlight interface (even the vendor interface) until next
         * reboot. It's why we should prevent video.ko from being used here
         * and we can't rely on a later call to acpi_video_unregister().
         */