From: Len Brown <len.brown@intel.com>
Date: Wed, 10 Oct 2007 04:29:11 +0000 (-0400)
Subject: Pull video into release branch
X-Git-Tag: v2.6.24-rc1~135^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73a855f70d9b3571fa878727cbc568d9774c6dce;p=linux-2.6

Pull video into release branch

Conflicts:

	drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

73a855f70d9b3571fa878727cbc568d9774c6dce
diff --cc drivers/acpi/video.c
index d05891f162,8a60a3d700..f31e3c8749
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -415,8 -415,11 +415,11 @@@ acpi_video_device_lcd_set_level(struct 
  
  
  	arg0.integer.value = level;
- 	status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL);
 +
+ 	if (device->cap._BCM)
+ 		status = acpi_evaluate_object(device->dev->handle, "_BCM",
+ 					      &args, NULL);
+ 	device->brightness->curr = level;
 -	printk(KERN_DEBUG "set_level status: %x\n", status);
  	return status;
  }