diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /target/linux/generic/patches-3.9/830-ledtrig_morse.patch | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'target/linux/generic/patches-3.9/830-ledtrig_morse.patch')
| -rw-r--r-- | target/linux/generic/patches-3.9/830-ledtrig_morse.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.9/830-ledtrig_morse.patch b/target/linux/generic/patches-3.9/830-ledtrig_morse.patch new file mode 100644 index 000000000..df2b7208d --- /dev/null +++ b/target/linux/generic/patches-3.9/830-ledtrig_morse.patch @@ -0,0 +1,28 @@ +--- a/drivers/leds/Kconfig ++++ b/drivers/leds/Kconfig +@@ -571,4 +571,8 @@ config LEDS_TRIGGER_TRANSIENT + GPIO/PWM based hardware. + If unsure, say Y. + ++config LEDS_TRIGGER_MORSE ++ tristate "LED Morse Trigger" ++ depends on LEDS_TRIGGERS ++ + endif # NEW_LEDS +--- a/drivers/leds/Makefile ++++ b/drivers/leds/Makefile +@@ -66,3 +66,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt + 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_TRIGGER_MORSE) += ledtrig-morse.o +--- a/drivers/leds/ledtrig-morse.c ++++ b/drivers/leds/ledtrig-morse.c +@@ -26,7 +26,6 @@ + #include <linux/list.h> + #include <linux/spinlock.h> + #include <linux/device.h> +-#include <linux/sysdev.h> + #include <linux/timer.h> + #include <linux/ctype.h> + #include <linux/leds.h> |