13 files changed, 121 insertions, 117 deletions

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index c7f755034375..d44806d41b44 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -479,106 +479,7 @@ config LEDS_BLINKM
           This option enables support for the BlinkM RGB LED connected
           through I2C. Say Y to enable support for the BlinkM LED.
 
-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.
-
 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
-          blinking the LED without any further software interaction.
-          For more details read Documentation/leds/leds-class.txt.
-
-          If unsure, say Y.
-
-config LEDS_TRIGGER_ONESHOT
-        tristate "LED One-shot Trigger"
-        depends on LEDS_TRIGGERS
-        help
-          This allows LEDs to blink in one-shot pulses with parameters
-          controlled via sysfs.  It's useful to notify the user on
-          sporadic events, when there are no clear begin and end trap points,
-          or on dense events, where this blinks the LED at constant rate if
-          rearmed continuously.
-
-          It also shows how to use the led_blink_set_oneshot() function.
-
-          If unsure, say Y.
-
-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
-          load average.
-          If unsure, say Y.
-
-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.
-
-          If unsure, say N.
-
-config LEDS_TRIGGER_CPU
-        bool "LED CPU Trigger"
-        depends on LEDS_TRIGGERS
-        help
-          This allows LEDs to be controlled by active CPUs. This shows
-          the active CPUs across an array of LEDs so you can see which
-          CPUs are active on the system at any given moment.
-
-          If unsure, say N.
-
-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
-          when using gpios as switches and triggering the needed LEDs
-          from there. One use case is n810's keypad LEDs that could
-          be triggered by this trigger when user slides up to show
-          keypad.
-
-          If unsure, say N.
-
-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.
-
-comment "iptables trigger is under Netfilter config (LED target)"
-        depends on LEDS_TRIGGERS
-
-config LEDS_TRIGGER_TRANSIENT
-        tristate "LED Transient Trigger"
-        depends on LEDS_TRIGGERS
-        help
-          This allows one time activation of a transient state on
-          GPIO/PWM based hardware.
-          If unsure, say Y.
+source "drivers/leds/trigger/Kconfig"
 
 endif # NEW_LEDS
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index ab8f5c549ad3..ac2897732b02 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -58,12 +58,4 @@ obj-$(CONFIG_LEDS_BLINKM)		+= leds-blinkm.o
 obj-$(CONFIG_LEDS_DAC124S085)           += leds-dac124s085.o
 
 # LED Triggers
-obj-$(CONFIG_LEDS_TRIGGER_TIMER)        += ledtrig-timer.o
-obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)      += ledtrig-oneshot.o
-obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)     += ledtrig-ide-disk.o
-obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)    += ledtrig-heartbeat.o
-obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)    += ledtrig-backlight.o
-obj-$(CONFIG_LEDS_TRIGGER_GPIO)         += ledtrig-gpio.o
-obj-$(CONFIG_LEDS_TRIGGER_CPU)          += ledtrig-cpu.o
-obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)   += ledtrig-default-on.o
-obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)    += ledtrig-transient.o
+obj-$(CONFIG_LEDS_TRIGGERS)             += trigger/
diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
new file mode 100644
index 000000000000..eaa286dc494e
--- /dev/null
+++ b/drivers/leds/trigger/Kconfig
@@ -0,0 +1,103 @@
+menuconfig 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
+
+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
+          blinking the LED without any further software interaction.
+          For more details read Documentation/leds/leds-class.txt.
+
+          If unsure, say Y.
+
+config LEDS_TRIGGER_ONESHOT
+        tristate "LED One-shot Trigger"
+        depends on LEDS_TRIGGERS
+        help
+          This allows LEDs to blink in one-shot pulses with parameters
+          controlled via sysfs.  It's useful to notify the user on
+          sporadic events, when there are no clear begin and end trap points,
+          or on dense events, where this blinks the LED at constant rate if
+          rearmed continuously.
+
+          It also shows how to use the led_blink_set_oneshot() function.
+
+          If unsure, say Y.
+
+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
+          load average.
+          If unsure, say Y.
+
+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.
+
+          If unsure, say N.
+
+config LEDS_TRIGGER_CPU
+        bool "LED CPU Trigger"
+        depends on LEDS_TRIGGERS
+        help
+          This allows LEDs to be controlled by active CPUs. This shows
+          the active CPUs across an array of LEDs so you can see which
+          CPUs are active on the system at any given moment.
+
+          If unsure, say N.
+
+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
+          when using gpios as switches and triggering the needed LEDs
+          from there. One use case is n810's keypad LEDs that could
+          be triggered by this trigger when user slides up to show
+          keypad.
+
+          If unsure, say N.
+
+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.
+
+comment "iptables trigger is under Netfilter config (LED target)"
+        depends on LEDS_TRIGGERS
+
+config LEDS_TRIGGER_TRANSIENT
+        tristate "LED Transient Trigger"
+        depends on LEDS_TRIGGERS
+        help
+          This allows one time activation of a transient state on
+          GPIO/PWM based hardware.
+          If unsure, say Y.
+
+endif # LEDS_TRIGGERS
diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
new file mode 100644
index 000000000000..554e46ee4c24
--- /dev/null
+++ b/drivers/leds/trigger/Makefile
@@ -0,0 +1,9 @@
+obj-$(CONFIG_LEDS_TRIGGER_TIMER)        += ledtrig-timer.o
+obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)      += ledtrig-oneshot.o
+obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)     += ledtrig-ide-disk.o
+obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)    += ledtrig-heartbeat.o
+obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)    += ledtrig-backlight.o
+obj-$(CONFIG_LEDS_TRIGGER_GPIO)         += ledtrig-gpio.o
+obj-$(CONFIG_LEDS_TRIGGER_CPU)          += ledtrig-cpu.o
+obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)   += ledtrig-default-on.o
+obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)    += ledtrig-transient.o
diff --git a/drivers/leds/ledtrig-backlight.c b/drivers/leds/trigger/ledtrig-backlight.c
index 027a2b15d7d8..3c9c88a07eb8 100644
--- a/drivers/leds/ledtrig-backlight.c
+++ b/drivers/leds/trigger/ledtrig-backlight.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/fb.h>
 #include <linux/leds.h>
-#include "leds.h"
+#include "../leds.h"
 
 #define BLANK           1
 #define UNBLANK         0
diff --git a/drivers/leds/ledtrig-cpu.c b/drivers/leds/trigger/ledtrig-cpu.c
index 4239b3955ff0..118335eccc56 100644
--- a/drivers/leds/ledtrig-cpu.c
+++ b/drivers/leds/trigger/ledtrig-cpu.c
@@ -26,7 +26,7 @@
 #include <linux/percpu.h>
 #include <linux/syscore_ops.h>
 #include <linux/rwsem.h>
-#include "leds.h"
+#include "../leds.h"
 
 #define MAX_NAME_LEN    8
 
diff --git a/drivers/leds/ledtrig-default-on.c b/drivers/leds/trigger/ledtrig-default-on.c
index eac1f1b1adac..81a91be8e18d 100644
--- a/drivers/leds/ledtrig-default-on.c
+++ b/drivers/leds/trigger/ledtrig-default-on.c
@@ -15,7 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/leds.h>
-#include "leds.h"
+#include "../leds.h"
 
 static void defon_trig_activate(struct led_classdev *led_cdev)
 {
diff --git a/drivers/leds/ledtrig-gpio.c b/drivers/leds/trigger/ledtrig-gpio.c
index 72e3ebfc281f..35812e3a37f2 100644
--- a/drivers/leds/ledtrig-gpio.c
+++ b/drivers/leds/trigger/ledtrig-gpio.c
@@ -17,7 +17,7 @@
 #include <linux/workqueue.h>
 #include <linux/leds.h>
 #include <linux/slab.h>
-#include "leds.h"
+#include "../leds.h"
 
 struct gpio_trig_data {
         struct led_classdev *led;
diff --git a/drivers/leds/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c
index 1edc7463ce83..5c8464a33172 100644
--- a/drivers/leds/ledtrig-heartbeat.c
+++ b/drivers/leds/trigger/ledtrig-heartbeat.c
@@ -19,7 +19,7 @@
 #include <linux/sched.h>
 #include <linux/leds.h>
 #include <linux/reboot.h>
-#include "leds.h"
+#include "../leds.h"
 
 static int panic_heartbeats;
 
diff --git a/drivers/leds/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtrig-ide-disk.c
index 2cd7c0cf5924..2cd7c0cf5924 100644
--- a/drivers/leds/ledtrig-ide-disk.c
+++ b/drivers/leds/trigger/ledtrig-ide-disk.c
diff --git a/drivers/leds/ledtrig-oneshot.c b/drivers/leds/trigger/ledtrig-oneshot.c
index 2c029aa5c4f1..cb4c7466692a 100644
--- a/drivers/leds/ledtrig-oneshot.c
+++ b/drivers/leds/trigger/ledtrig-oneshot.c
@@ -18,7 +18,7 @@
 #include <linux/ctype.h>
 #include <linux/slab.h>
 #include <linux/leds.h>
-#include "leds.h"
+#include "../leds.h"
 
 #define DEFAULT_DELAY 100
 
diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/trigger/ledtrig-timer.c
index f774d0592204..8d09327b5719 100644
--- a/drivers/leds/ledtrig-timer.c
+++ b/drivers/leds/trigger/ledtrig-timer.c
@@ -17,7 +17,6 @@
 #include <linux/device.h>
 #include <linux/ctype.h>
 #include <linux/leds.h>
-#include "leds.h"
 
 static ssize_t led_delay_on_show(struct device *dev,
                 struct device_attribute *attr, char *buf)
diff --git a/drivers/leds/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c
index 398f1042c43e..e5abc00bb00c 100644
--- a/drivers/leds/ledtrig-transient.c
+++ b/drivers/leds/trigger/ledtrig-transient.c
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/timer.h>
 #include <linux/leds.h>
-#include "leds.h"
+#include "../leds.h"
 
 struct transient_trig_data {
         int activate;