The following commit has been merged in the linux branch: commit 2906206350b7e13e2047467cc29a0a2d78d71cb2 Author: Jonathan Woithe jwoithe@physics.adelaide.edu.au Date: Thu Oct 8 13:19:12 2009 +0930

fujitsu-laptop: address missed led-class ifdef fixup

A follow-up 2.6.32-rc1's

1e384cb0f9a940f2a431d1708f963987e61d71e3 "fujitsu-laptop: support led-class as module"

It's a trivial fix for one of the CONFIG_LEDS_CLASS ifdefs which was somehow missed in the original patch.

Signed-off-by: Jonathan Woithe jwoithe@physics.adelaide.edu.au Signed-off-by: Len Brown len.brown@intel.com

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);