diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/acpi/video.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/acpi/video.c')
| -rw-r--r-- | drivers/acpi/video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 31e9e10f657e..ec574fc8fbc6 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -1354,7 +1354,7 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video, | |||
| 1354 | status = acpi_video_bus_get_one_device(dev, video); | 1354 | status = acpi_video_bus_get_one_device(dev, video); |
| 1355 | if (ACPI_FAILURE(status)) { | 1355 | if (ACPI_FAILURE(status)) { |
| 1356 | printk(KERN_WARNING PREFIX | 1356 | printk(KERN_WARNING PREFIX |
| 1357 | "Cant attach device\n"); | 1357 | "Can't attach device\n"); |
| 1358 | continue; | 1358 | continue; |
| 1359 | } | 1359 | } |
| 1360 | } | 1360 | } |
| @@ -1373,7 +1373,7 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device) | |||
| 1373 | acpi_video_device_notify); | 1373 | acpi_video_device_notify); |
| 1374 | if (ACPI_FAILURE(status)) { | 1374 | if (ACPI_FAILURE(status)) { |
| 1375 | printk(KERN_WARNING PREFIX | 1375 | printk(KERN_WARNING PREFIX |
| 1376 | "Cant remove video notify handler\n"); | 1376 | "Can't remove video notify handler\n"); |
| 1377 | } | 1377 | } |
| 1378 | if (device->backlight) { | 1378 | if (device->backlight) { |
| 1379 | backlight_device_unregister(device->backlight); | 1379 | backlight_device_unregister(device->backlight); |