summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-10-15 04:47:13 (GMT)
committerLen Brown <len.brown@intel.com>2009-10-15 04:47:13 (GMT)
commitd59733c1e56784a99381799021c4f9698f3e6379 (patch)
treeeee7c84624df2aedeefc9c6eef9577f4ef6d4da5 /drivers/platform
parent4697fd6f6a6277b33093fc807786f16cabe30b31 (diff)
parent2c907b72db4dd4e8af6dccb6e0ac122d78627b8d (diff)
downloadlinux-d59733c1e56784a99381799021c4f9698f3e6379.tar.xz
Merge branch 'misc' into release
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/fujitsu-laptop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index f35aee5..bcd4ba8 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)
struct fujitsu_hotkey_t *fujitsu_hotkey = acpi_driver_data(device);
struct input_dev *input = fujitsu_hotkey->input;
-#ifdef CONFIG_LEDS_CLASS
+#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
if (fujitsu_hotkey->logolamp_registered)
led_classdev_unregister(&logolamp_led);