Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 575593a8b4e6..fc2f26b9b407 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -7,7 +7,7 @@
  * video_detect.c:
  * Provides acpi_is_video_device() for early scanning of ACPI devices in scan.c
  * There a Linux specific (Spec does not provide a HID for video devices) is
- * assinged
+ * assigned
  *
  * After PCI devices are glued with ACPI devices
  * acpi_get_pci_dev() can be called to identify ACPI graphics
@@ -83,16 +83,16 @@ long acpi_is_video_device(struct acpi_device *device)
         if (!device)
                 return 0;
 
-        /* Does this device able to support video switching ? */
+        /* Is this device able to support video switching ? */
         if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) ||
             ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))
                 video_caps |= ACPI_VIDEO_OUTPUT_SWITCHING;
 
-        /* Does this device able to retrieve a video ROM ? */
+        /* Is this device able to retrieve a video ROM ? */
         if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy)))
                 video_caps |= ACPI_VIDEO_ROM_AVAILABLE;
 
-        /* Does this device able to configure which video head to be POSTed ? */
+        /* Is this device able to configure which video head to be POSTed ? */
         if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) &&
             ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) &&
             ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy)))
@@ -101,7 +101,7 @@ long acpi_is_video_device(struct acpi_device *device)
         /* Only check for backlight functionality if one of the above hit. */
         if (video_caps)
                 acpi_walk_namespace(ACPI_TYPE_DEVICE, device->handle,
-                                    ACPI_UINT32_MAX, acpi_backlight_cap_match,
+                                    ACPI_UINT32_MAX, acpi_backlight_cap_match, NULL,
                                     &video_caps, NULL);
 
         return video_caps;
@@ -137,7 +137,7 @@ find_video(acpi_handle handle, u32 lvl, void *context, void **rv)
  *
  * if NULL is passed as argument all ACPI devices are enumerated and
  * all graphics capabilities of physically present devices are
- * summerized and returned. This is cached and done only once.
+ * summarized and returned. This is cached and done only once.
  */
 long acpi_video_get_capabilities(acpi_handle graphics_handle)
 {
@@ -151,7 +151,7 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle)
         if (!graphics_handle) {
                 /* Only do the global walk through all graphics devices once */
                 acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                    ACPI_UINT32_MAX, find_video,
+                                    ACPI_UINT32_MAX, find_video, NULL,
                                     &caps, NULL);
                 /* There might be boot param flags set already... */
                 acpi_video_support |= caps;
@@ -173,7 +173,7 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle)
                         return 0;
                 }
                 acpi_walk_namespace(ACPI_TYPE_DEVICE, graphics_handle,
-                                    ACPI_UINT32_MAX, find_video,
+                                    ACPI_UINT32_MAX, find_video, NULL,
                                     &caps, NULL);
         }
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "We have 0x%lX video support %s %s\n",