diff options
| author | Len Brown <len.brown@intel.com> | 2009-10-15 00:47:13 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-10-15 00:47:13 -0400 |
| commit | d59733c1e56784a99381799021c4f9698f3e6379 (patch) | |
| tree | eee7c84624df2aedeefc9c6eef9577f4ef6d4da5 /drivers/platform/x86 | |
| parent | 4697fd6f6a6277b33093fc807786f16cabe30b31 (diff) | |
| parent | 2c907b72db4dd4e8af6dccb6e0ac122d78627b8d (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/platform/x86')
| -rw-r--r-- | drivers/platform/x86/fujitsu-laptop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index f35aee5c2149..bcd4ba8be7db 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c | |||
| @@ -944,7 +944,7 @@ static int acpi_fujitsu_hotkey_remove(struct acpi_device *device, int type) | |||
| 944 | struct fujitsu_hotkey_t *fujitsu_hotkey = acpi_driver_data(device); | 944 | struct fujitsu_hotkey_t *fujitsu_hotkey = acpi_driver_data(device); |
| 945 | struct input_dev *input = fujitsu_hotkey->input; | 945 | struct input_dev *input = fujitsu_hotkey->input; |
| 946 | 946 | ||
| 947 | #ifdef CONFIG_LEDS_CLASS | 947 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) |
| 948 | if (fujitsu_hotkey->logolamp_registered) | 948 | if (fujitsu_hotkey->logolamp_registered) |
| 949 | led_classdev_unregister(&logolamp_led); | 949 | led_classdev_unregister(&logolamp_led); |
| 950 | 950 | ||