diff --git a/[refs] b/[refs]
index 27fea679c73e..dd2e7aa112f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d9f0952e72dccc40646997346338031d03832b3
+refs/heads/master: 2f9d2827afab6a6ad82b657b1d7fe00cbffa65f8
diff --git a/trunk/drivers/input/joystick/Kconfig b/trunk/drivers/input/joystick/Kconfig
index e2abe18e575d..7c662ee594a3 100644
--- a/trunk/drivers/input/joystick/Kconfig
+++ b/trunk/drivers/input/joystick/Kconfig
@@ -277,7 +277,7 @@ config JOYSTICK_XPAD_FF
 
 config JOYSTICK_XPAD_LEDS
 	bool "LED Support for Xbox360 controller 'BigX' LED"
-	depends on LEDS_CLASS && JOYSTICK_XPAD
+	depends on JOYSTICK_XPAD && (LEDS_CLASS=y || LEDS_CLASS=JOYSTICK_XPAD)
 	---help---
 	  This option enables support for the LED which surrounds the Big X on
 	  XBox 360 controller.