diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
| commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
| tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/misc/sony-laptop.c | |
| parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
| parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
Merge branch 'misc' into test
Diffstat (limited to 'drivers/misc/sony-laptop.c')
| -rw-r--r-- | drivers/misc/sony-laptop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 60775be22822..5a97d3a9d745 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
| @@ -970,7 +970,7 @@ static int sony_nc_resume(struct acpi_device *device) | |||
| 970 | /* set the last requested brightness level */ | 970 | /* set the last requested brightness level */ |
| 971 | if (sony_backlight_device && | 971 | if (sony_backlight_device && |
| 972 | !sony_backlight_update_status(sony_backlight_device)) | 972 | !sony_backlight_update_status(sony_backlight_device)) |
| 973 | printk(KERN_WARNING DRV_PFX "unable to restore brightness level"); | 973 | printk(KERN_WARNING DRV_PFX "unable to restore brightness level\n"); |
| 974 | 974 | ||
| 975 | /* re-initialize models with specific requirements */ | 975 | /* re-initialize models with specific requirements */ |
| 976 | dmi_check_system(sony_nc_ids); | 976 | dmi_check_system(sony_nc_ids); |