summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/830-ledtrig_morse.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-24 13:05:22 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-24 13:05:22 +0000
commiteb0c0200624c487af549aca9eddb722413dbc1cd (patch)
treeb152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/830-ledtrig_morse.patch
parent8b3c85ca8244eec0d01eea269922d780f73ccebb (diff)
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/830-ledtrig_morse.patch')
-rw-r--r--target/linux/generic/patches-3.6/830-ledtrig_morse.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.6/830-ledtrig_morse.patch b/target/linux/generic/patches-3.6/830-ledtrig_morse.patch
index 3283807f2..9692712ea 100644
--- a/target/linux/generic/patches-3.6/830-ledtrig_morse.patch
+++ b/target/linux/generic/patches-3.6/830-ledtrig_morse.patch
@@ -1,8 +1,8 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
-@@ -480,4 +480,8 @@ config LEDS_TRIGGER_DEFAULT_ON
- comment "iptables trigger is under Netfilter config (LED target)"
- depends on LEDS_TRIGGERS
+@@ -537,4 +537,8 @@ config LEDS_TRIGGER_TRANSIENT
+ GPIO/PWM based hardware.
+ If unsure, say Y.
+config LEDS_TRIGGER_MORSE
+ tristate "LED Morse Trigger"
@@ -11,10 +11,10 @@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -57,3 +57,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o
+@@ -63,3 +63,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
+ obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT) += ledtrig-transient.o
+obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
--- a/drivers/leds/ledtrig-morse.c
+++ b/drivers/leds/ledtrig-morse.c