diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-12-08 11:18:47 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-12-08 11:18:47 -0500 |
| commit | c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59 (patch) | |
| tree | 878768b69df25459b448aa890352342c4a3c6e2d /drivers/misc/sony-laptop.c | |
| parent | dcc7461eef7341e84e2f7274f904ce01a43b2506 (diff) | |
| parent | 218d11a8b071b23b76c484fd5f72a4fe3306801e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/misc/sony-laptop.c')
| -rw-r--r-- | drivers/misc/sony-laptop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 7bcb81002dcf..571b211608d1 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
| @@ -1038,8 +1038,8 @@ static int sony_nc_add(struct acpi_device *device) | |||
| 1038 | goto outinput; | 1038 | goto outinput; |
| 1039 | } | 1039 | } |
| 1040 | 1040 | ||
| 1041 | if (!acpi_video_backlight_support()) { | 1041 | if (acpi_video_backlight_support()) { |
| 1042 | printk(KERN_INFO DRV_PFX "Sony: Brightness ignored, must be " | 1042 | printk(KERN_INFO DRV_PFX "brightness ignored, must be " |
| 1043 | "controlled by ACPI video driver\n"); | 1043 | "controlled by ACPI video driver\n"); |
| 1044 | } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", | 1044 | } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", |
| 1045 | &handle))) { | 1045 | &handle))) { |