diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-07 23:03:11 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 23:03:11 -0500 |
| commit | d5112a4f31a361409d3c57dc9d58dd69f8014bef (patch) | |
| tree | 64771300b2191cb94d9aaf60355661a01c2ccd1a /drivers/acpi/video.c | |
| parent | 12e86f92fcfe4f0bcab0ad7fa4088a64c60d9b38 (diff) | |
| parent | 5fad293bcbd48d9a2370020cf60e4b4a42559b12 (diff) | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.21
Diffstat (limited to 'drivers/acpi/video.c')
| -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 | ||