diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-17 01:24:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-17 01:24:49 -0400 |
| commit | c2f828977ba5d17c13debba374ea252d18e5ccfb (patch) | |
| tree | 49d95c5e9325f93f379e5c249bf5a39f8e8040ae /drivers/misc/msi-laptop.c | |
| parent | 6553daeafb4fa15cd07088f543352fa3779e86e1 (diff) | |
| parent | ecfe7f093768f7af0959f5be8ec039dcc29724af (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: thinkpad-acpi: bump up version to 0.16
ACPI: thinkpad-acpi: revert new 2.6.23 CONFIG_THINKPAD_ACPI_INPUT_ENABLED option
ACPI: fix CONFIG_NET=n acpi_bus_generate_netlink_event build failure
msi-laptop: replace ',' with ';'
ACPI: (more) delete CONFIG_ACPI_PROCFS_SLEEP (again)
Diffstat (limited to 'drivers/misc/msi-laptop.c')
| -rw-r--r-- | drivers/misc/msi-laptop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c index 932a415197b3..349be934db7c 100644 --- a/drivers/misc/msi-laptop.c +++ b/drivers/misc/msi-laptop.c | |||
| @@ -353,7 +353,7 @@ static int __init msi_init(void) | |||
| 353 | if (IS_ERR(msibl_device)) | 353 | if (IS_ERR(msibl_device)) |
| 354 | return PTR_ERR(msibl_device); | 354 | return PTR_ERR(msibl_device); |
| 355 | 355 | ||
| 356 | msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1, | 356 | msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1; |
| 357 | 357 | ||
| 358 | ret = platform_driver_register(&msipf_driver); | 358 | ret = platform_driver_register(&msipf_driver); |
| 359 | if (ret) | 359 | if (ret) |