From: Samuel Thibault Date: Tue, 5 Nov 2013 05:54:58 +0000 (+1100) Subject: input-route-kbd-leds-through-the-generic-leds-layer-fix-3 X-Git-Tag: next-20131105~2^2~318 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=494627b04b88f75398a4cfc06c906376f508f59a;p=karo-tx-linux.git input-route-kbd-leds-through-the-generic-leds-layer-fix-3 Link input/leds.c along input/input.c instead of separate module input.c needs to call leds.c and vice-versa, so it is simpler to stuff them together. INPUT_LEDS thus now depends on LEDS_CLASS being available enough for input.ko. This also documents the new leds field. Signed-off-by: Samuel Thibault Signed-off-by: Andrew Morton --- diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index a6edec382423..f77b406eac5f 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -179,8 +179,8 @@ comment "Input Device Drivers" source "drivers/input/keyboard/Kconfig" config INPUT_LEDS - tristate "LED Support" - depends on LEDS_CLASS + bool "LED Support" + depends on LEDS_CLASS = INPUT || LEDS_CLASS = y select LEDS_TRIGGERS default y help diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 9d6e9e20b156..2ab5f3336da5 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -6,6 +6,9 @@ obj-$(CONFIG_INPUT) += input-core.o input-core-y := input.o input-compat.o input-mt.o ff-core.o +ifeq ($(CONFIG_INPUT_LEDS),y) +input-core-y += leds.o +endif obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o obj-$(CONFIG_INPUT_POLLDEV) += input-polldev.o @@ -16,7 +19,6 @@ obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o obj-$(CONFIG_INPUT_JOYDEV) += joydev.o obj-$(CONFIG_INPUT_EVDEV) += evdev.o obj-$(CONFIG_INPUT_EVBUG) += evbug.o -obj-$(CONFIG_INPUT_LEDS) += leds.o obj-$(CONFIG_INPUT_KEYBOARD) += keyboard/ obj-$(CONFIG_INPUT_MOUSE) += mouse/ diff --git a/include/linux/input.h b/include/linux/input.h index 18a066f25778..6453b22372ac 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -79,6 +79,7 @@ struct input_value { * @led: reflects current state of device's LEDs * @snd: reflects current state of sound effects * @sw: reflects current state of device's switches + * @leds: leds objects for the device's LEDs * @open: this method is called when the very first user calls * input_open_device(). The driver must prepare the device * to start generating events (start polling thread,