Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bae35e1 authored by Johannes Berg's avatar Johannes Berg Committed by Linus Torvalds
Browse files

leds: fix up dependencies 



It's not useful to build LED triggers when there's no LEDs that can be
triggered by them.  Therefore, fix up the dependencies so that this
cannot happen, and fix a few users that select triggers to depend on
LEDS_CLASS as well (there is also one user that also selects LEDS_CLASS,
which is OK).

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reported-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Tested-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Arnd Hannemann <arnd@arndnet.de>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Richard Purdie <rpurdie@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e172662d

drivers/leds/Kconfig

+41 −9
Original line number Diff line number Diff line
@@ -7,20 +7,20 @@ menuconfig NEW_LEDS 
	  This is not related to standard keyboard LEDs which are controlled

	  via the input system.



if NEW_LEDS



config LEDS_CLASS

	bool "LED Class Support"

	depends on NEW_LEDS

	help

	  This option enables the led sysfs class in /sys/class/leds.  You'll

	  need this to do anything useful with LEDs.  If unsure, say N.



if LEDS_CLASS

if NEW_LEDS



comment "LED drivers"



config LEDS_88PM860X

	tristate "LED Support for Marvell 88PM860x PMIC"

	depends on LEDS_CLASS

	depends on MFD_88PM860X

	help

	  This option enables support for on-chip LED drivers found on Marvell
@@ -28,6 +28,7 @@ config LEDS_88PM860X 


config LEDS_ATMEL_PWM

	tristate "LED Support using Atmel PWM outputs"

	depends on LEDS_CLASS

	depends on ATMEL_PWM

	help

	  This option enables support for LEDs driven using outputs
@@ -35,6 +36,7 @@ config LEDS_ATMEL_PWM 


config LEDS_LOCOMO

	tristate "LED Support for Locomo device"

	depends on LEDS_CLASS

	depends on SHARP_LOCOMO

	help

	  This option enables support for the LEDs on Sharp Locomo.
@@ -42,6 +44,7 @@ config LEDS_LOCOMO 


config LEDS_MIKROTIK_RB532

	tristate "LED Support for Mikrotik Routerboard 532"

	depends on LEDS_CLASS

	depends on MIKROTIK_RB532

	help

	  This option enables support for the so called "User LED" of
@@ -49,6 +52,7 @@ config LEDS_MIKROTIK_RB532 


config LEDS_S3C24XX

	tristate "LED Support for Samsung S3C24XX GPIO LEDs"

	depends on LEDS_CLASS

	depends on ARCH_S3C2410

	help

	  This option enables support for LEDs connected to GPIO lines
@@ -56,12 +60,14 @@ config LEDS_S3C24XX 


config LEDS_AMS_DELTA

	tristate "LED Support for the Amstrad Delta (E3)"

	depends on LEDS_CLASS

	depends on MACH_AMS_DELTA

	help

	  This option enables support for the LEDs on Amstrad Delta (E3).



config LEDS_NET48XX

	tristate "LED Support for Soekris net48xx series Error LED"

	depends on LEDS_CLASS

	depends on SCx200_GPIO

	help

	  This option enables support for the Soekris net4801 and net4826 error
@@ -79,18 +85,21 @@ config LEDS_NET5501 


config LEDS_FSG

	tristate "LED Support for the Freecom FSG-3"

	depends on LEDS_CLASS

	depends on MACH_FSG

	help

	  This option enables support for the LEDs on the Freecom FSG-3.



config LEDS_WRAP

	tristate "LED Support for the WRAP series LEDs"

	depends on LEDS_CLASS

	depends on SCx200_GPIO

	help

	  This option enables support for the PCEngines WRAP programmable LEDs.



config LEDS_ALIX2

	tristate "LED Support for ALIX.2 and ALIX.3 series"

	depends on LEDS_CLASS

	depends on X86 && !GPIO_CS5535 && !CS5535_GPIO

	help

	  This option enables support for the PCEngines ALIX.2 and ALIX.3 LEDs.
@@ -98,12 +107,14 @@ config LEDS_ALIX2 


config LEDS_H1940

	tristate "LED Support for iPAQ H1940 device"

	depends on LEDS_CLASS

	depends on ARCH_H1940

	help

	  This option enables support for the LEDs on the h1940.



config LEDS_COBALT_QUBE

	tristate "LED Support for the Cobalt Qube series front LED"

	depends on LEDS_CLASS

	depends on MIPS_COBALT

	help

	  This option enables support for the front LED on Cobalt Qube series
@@ -117,6 +128,7 @@ config LEDS_COBALT_RAQ 


config LEDS_SUNFIRE

	tristate "LED support for SunFire servers."

	depends on LEDS_CLASS

	depends on SPARC64

	select LEDS_TRIGGERS

	help
@@ -125,6 +137,7 @@ config LEDS_SUNFIRE 


config LEDS_HP6XX

	tristate "LED Support for the HP Jornada 6xx"

	depends on LEDS_CLASS

	depends on SH_HP6XX

	help

	  This option enables LED support for the handheld
@@ -132,6 +145,7 @@ config LEDS_HP6XX 


config LEDS_PCA9532

	tristate "LED driver for PCA9532 dimmer"

	depends on LEDS_CLASS

	depends on I2C && INPUT && EXPERIMENTAL

	help

	  This option enables support for NXP pca9532
@@ -140,6 +154,7 @@ config LEDS_PCA9532 


config LEDS_GPIO

	tristate "LED Support for GPIO connected LEDs"

	depends on LEDS_CLASS

	depends on GENERIC_GPIO

	help

	  This option enables support for the LEDs connected to GPIO
@@ -167,6 +182,7 @@ config LEDS_GPIO_OF 


config LEDS_LP3944

	tristate "LED Support for N.S. LP3944 (Fun Light) I2C chip"

	depends on LEDS_CLASS

	depends on I2C

	help

	  This option enables support for LEDs connected to the National
@@ -196,6 +212,7 @@ config LEDS_LP5523 


config LEDS_CLEVO_MAIL

	tristate "Mail LED on Clevo notebook"

	depends on LEDS_CLASS

	depends on X86 && SERIO_I8042 && DMI

	help

	  This driver makes the mail LED accessible from userspace
@@ -226,6 +243,7 @@ config LEDS_CLEVO_MAIL 


config LEDS_PCA955X

	tristate "LED Support for PCA955x I2C chips"

	depends on LEDS_CLASS

	depends on I2C

	help

	  This option enables support for LEDs connected to PCA955x
@@ -234,6 +252,7 @@ config LEDS_PCA955X 


config LEDS_WM831X_STATUS

	tristate "LED support for status LEDs on WM831x PMICs"

	depends on LEDS_CLASS

	depends on MFD_WM831X

	help

	  This option enables support for the status LEDs of the WM831x
@@ -241,6 +260,7 @@ config LEDS_WM831X_STATUS 


config LEDS_WM8350

	tristate "LED Support for WM8350 AudioPlus PMIC"

	depends on LEDS_CLASS

	depends on MFD_WM8350

	help

	  This option enables support for LEDs driven by the Wolfson
@@ -248,6 +268,7 @@ config LEDS_WM8350 


config LEDS_DA903X

	tristate "LED Support for DA9030/DA9034 PMIC"

	depends on LEDS_CLASS

	depends on PMIC_DA903X

	help

	  This option enables support for on-chip LED drivers found
@@ -255,6 +276,7 @@ config LEDS_DA903X 


config LEDS_DAC124S085

	tristate "LED Support for DAC124S085 SPI DAC"

	depends on LEDS_CLASS

	depends on SPI

	help

	  This option enables support for DAC124S085 SPI DAC from NatSemi,
@@ -262,18 +284,21 @@ config LEDS_DAC124S085 


config LEDS_PWM

	tristate "PWM driven LED Support"

	depends on LEDS_CLASS

	depends on HAVE_PWM

	help

	  This option enables support for pwm driven LEDs



config LEDS_REGULATOR

	tristate "REGULATOR driven LED support"

	depends on LEDS_CLASS

	depends on REGULATOR

	help

	  This option enables support for regulator driven LEDs.



config LEDS_BD2802

	tristate "LED driver for BD2802 RGB LED"

	depends on LEDS_CLASS

	depends on I2C

	help

	  This option enables support for BD2802GU RGB LED driver chips
@@ -281,6 +306,7 @@ config LEDS_BD2802 


config LEDS_INTEL_SS4200

	tristate "LED driver for Intel NAS SS4200 series"

	depends on LEDS_CLASS

	depends on PCI && DMI

	help

	  This option enables support for the Intel SS4200 series of
@@ -290,6 +316,7 @@ config LEDS_INTEL_SS4200 


config LEDS_LT3593

	tristate "LED driver for LT3593 controllers"

	depends on LEDS_CLASS

	depends on GENERIC_GPIO

	help

	  This option enables support for LEDs driven by a Linear Technology
@@ -298,6 +325,7 @@ config LEDS_LT3593 


config LEDS_ADP5520

	tristate "LED Support for ADP5520/ADP5501 PMIC"

	depends on LEDS_CLASS

	depends on PMIC_ADP5520

	help

	  This option enables support for on-chip LED drivers found
@@ -308,6 +336,7 @@ config LEDS_ADP5520 


config LEDS_DELL_NETBOOKS

	tristate "External LED on Dell Business Netbooks"

	depends on LEDS_CLASS

	depends on X86 && ACPI_WMI

	help

	  This adds support for the Latitude 2100 and similar
@@ -315,6 +344,7 @@ config LEDS_DELL_NETBOOKS 


config LEDS_MC13783

	tristate "LED Support for MC13783 PMIC"

	depends on LEDS_CLASS

	depends on MFD_MC13783

	help

	  This option enable support for on-chip LED drivers found
@@ -322,6 +352,7 @@ config LEDS_MC13783 


config LEDS_NS2

	tristate "LED support for Network Space v2 GPIO LEDs"

	depends on LEDS_CLASS

	depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || MACH_NETSPACE_MAX_V2 || D2NET_V2

	default y

	help
@@ -340,17 +371,17 @@ config LEDS_NETXBIG 


config LEDS_TRIGGERS

	bool "LED Trigger support"

	depends on LEDS_CLASS

	help

	  This option enables trigger support for the leds class.

	  These triggers allow kernel events to drive the LEDs and can

	  be configured via sysfs. If unsure, say Y.



if LEDS_TRIGGERS



comment "LED Triggers"



config LEDS_TRIGGER_TIMER

	tristate "LED Timer Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by a programmable timer

	  via sysfs. Some LED hardware can be programmed to start
@@ -362,12 +393,14 @@ config LEDS_TRIGGER_TIMER 
config LEDS_TRIGGER_IDE_DISK

	bool "LED IDE Disk Trigger"

	depends on IDE_GD_ATA

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by IDE disk activity.

	  If unsure, say Y.



config LEDS_TRIGGER_HEARTBEAT

	tristate "LED Heartbeat Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled by a CPU load average.

	  The flash frequency is a hyperbolic function of the 1-minute
@@ -376,6 +409,7 @@ config LEDS_TRIGGER_HEARTBEAT 


config LEDS_TRIGGER_BACKLIGHT

	tristate "LED backlight Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be controlled as a backlight device: they

	  turn off and on when the display is blanked and unblanked.
@@ -384,6 +418,7 @@ config LEDS_TRIGGER_BACKLIGHT 


config LEDS_TRIGGER_GPIO

	tristate "LED GPIO Trigger"

	depends on LEDS_TRIGGERS

	depends on GPIOLIB

	help

	  This allows LEDs to be controlled by gpio events. It's good
@@ -396,6 +431,7 @@ config LEDS_TRIGGER_GPIO 


config LEDS_TRIGGER_DEFAULT_ON

	tristate "LED Default ON Trigger"

	depends on LEDS_TRIGGERS

	help

	  This allows LEDs to be initialised in the ON state.

	  If unsure, say Y.
@@ -403,8 +439,4 @@ config LEDS_TRIGGER_DEFAULT_ON 
comment "iptables trigger is under Netfilter config (LED target)"

	depends on LEDS_TRIGGERS



endif # LEDS_TRIGGERS



endif # LEDS_CLASS



endif # NEW_LEDS

drivers/macintosh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ config ADB_PMU_LED 
config ADB_PMU_LED_IDE

	bool "Use front LED as IDE LED by default"

	depends on ADB_PMU_LED

	depends on LEDS_CLASS

	select LEDS_TRIGGERS

	select LEDS_TRIGGER_IDE_DISK

	help

net/mac80211/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ config MAC80211_MESH 
config MAC80211_LEDS

	bool "Enable LED triggers"

	depends on MAC80211

	select NEW_LEDS

	depends on LEDS_CLASS

	select LEDS_TRIGGERS

	---help---

	  This option enables a few LED triggers for different