diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
| commit | e47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch) | |
| tree | 57389653c37d001de3a90655cb4172ba29199ce4 /drivers/acpi | |
| parent | d344bff9c36db17dc4765215495aaa7212c1eb6c (diff) | |
| parent | 419dd8378dfa32985672ab7927b4bc827f33b332 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/video.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 36b37d755dbc..3d54680d0333 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -1677,8 +1677,6 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data) | |||
| 1677 | struct acpi_video_device *video_device = data; | 1677 | struct acpi_video_device *video_device = data; |
| 1678 | struct acpi_device *device = NULL; | 1678 | struct acpi_device *device = NULL; |
| 1679 | 1679 | ||
| 1680 | |||
| 1681 | printk("video device notify\n"); | ||
| 1682 | if (!video_device) | 1680 | if (!video_device) |
| 1683 | return; | 1681 | return; |
| 1684 | 1682 | ||