diff options
| author | Len Brown <len.brown@intel.com> | 2007-09-21 21:55:29 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-09-21 21:55:29 -0400 |
| commit | 19adc6ba6c6a23e07617fe791db40c1b0668d123 (patch) | |
| tree | ed3d5604eacb8f3cc7e254f61a6cad8ec779fa31 /drivers/acpi | |
| parent | 335fb8fc71692830aca0a5a5fe7f60016ee0d0aa (diff) | |
| parent | 7f10cc4e838c2b2d7272031954c56c407569d497 (diff) | |
Pull now into release branch
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/video.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 3c9bb85a6a93..d05891f16282 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -417,7 +417,6 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level) | |||
| 417 | arg0.integer.value = level; | 417 | arg0.integer.value = level; |
| 418 | status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL); | 418 | status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL); |
| 419 | 419 | ||
| 420 | printk(KERN_DEBUG "set_level status: %x\n", status); | ||
| 421 | return status; | 420 | return status; |
| 422 | } | 421 | } |
| 423 | 422 | ||
| @@ -1754,7 +1753,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video) | |||
| 1754 | 1753 | ||
| 1755 | static int acpi_video_bus_start_devices(struct acpi_video_bus *video) | 1754 | static int acpi_video_bus_start_devices(struct acpi_video_bus *video) |
| 1756 | { | 1755 | { |
| 1757 | return acpi_video_bus_DOS(video, 1, 0); | 1756 | return acpi_video_bus_DOS(video, 0, 0); |
| 1758 | } | 1757 | } |
| 1759 | 1758 | ||
| 1760 | static int acpi_video_bus_stop_devices(struct acpi_video_bus *video) | 1759 | static int acpi_video_bus_stop_devices(struct acpi_video_bus *video) |