diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-22 12:56:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-22 12:56:48 -0700 |
| commit | 1f0cff6e4d579ab0fe671c02fcd842694e46b90f (patch) | |
| tree | b88bd0df8a97600d09aeecb598ac1f336997a608 /drivers/acpi/video.c | |
| parent | 6110e02b97377a2903853faf3ecaff0e742fbe93 (diff) | |
| parent | e5c86b5d4a517d10db89456426590ecba1597f1f (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: suspend: consolidate handling of Sx states addendum
ACPI: suspend: consolidate handling of Sx states.
ACPI: video: remove dmesg spam
ACPI: video: _DOS=0 by default to prevent hotkey hang
Diffstat (limited to 'drivers/acpi/video.c')
| -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 3c9bb85a6a9..d05891f1628 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) arg0.integer.value = level; status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL); - printk(KERN_DEBUG "set_level status: %x\n", status); return status; } @@ -1754,7 +1753,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video) static int acpi_video_bus_start_devices(struct acpi_video_bus *video) { - return acpi_video_bus_DOS(video, 1, 0); + return acpi_video_bus_DOS(video, 0, 0); } static int acpi_video_bus_stop_devices(struct acpi_video_bus *video) |