Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPICA: Update version to 20091112.
  ACPICA: Add additional module-level code support
  ACPICA: Deploy new create integer interface where appropriate
  ACPICA: New internal utility function to create Integer objects
  ACPICA: Add repair for predefined methods that must return sorted lists
  ACPICA: Fix possible fault if return Package objects contain NULL elements
  ACPICA: Add post-order callback to acpi_walk_namespace
  ACPICA: Change package length error message to an info message
  ACPICA: Reduce severity of predefined repair messages, Warning to Info
  ACPICA: Update version to 20091013
  ACPICA: Fix possible memory leak for Scope ASL operator
  ACPICA: Remove possibility of executing _REG methods twice
  ACPICA: Add repair for bad _MAT buffers
  ACPICA: Add repair for bad _BIF/_BIX packages

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 27c77729c7ca..fc2f26b9b407 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -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;
@@ -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",