diff options
Diffstat (limited to 'target/linux/generic/patches-4.1')
3 files changed, 8 insertions, 36 deletions
diff --git a/target/linux/generic/patches-4.1/830-ledtrig_morse.patch b/target/linux/generic/patches-4.1/830-ledtrig_morse.patch deleted file mode 100644 index 31b578136c..0000000000 --- a/target/linux/generic/patches-4.1/830-ledtrig_morse.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/drivers/leds/trigger/Kconfig -+++ b/drivers/leds/trigger/Kconfig -@@ -108,4 +108,8 @@ config LEDS_TRIGGER_CAMERA - This enables direct flash/torch on/off by the driver, kernel space. - If unsure, say Y. - -+config LEDS_TRIGGER_MORSE -+ tristate "LED Morse Trigger" -+ depends on LEDS_TRIGGERS -+ - endif # LEDS_TRIGGERS ---- a/drivers/leds/Makefile -+++ b/drivers/leds/Makefile -@@ -65,3 +65,4 @@ obj-$(CONFIG_LEDS_DAC124S085) += leds-d - - # LED Triggers - obj-$(CONFIG_LEDS_TRIGGERS) += trigger/ -+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> diff --git a/target/linux/generic/patches-4.1/831-ledtrig_netdev.patch b/target/linux/generic/patches-4.1/831-ledtrig_netdev.patch index 571c6dd5ac..f6f1f51b93 100644 --- a/target/linux/generic/patches-4.1/831-ledtrig_netdev.patch +++ b/target/linux/generic/patches-4.1/831-ledtrig_netdev.patch @@ -1,8 +1,8 @@ --- a/drivers/leds/trigger/Kconfig +++ b/drivers/leds/trigger/Kconfig -@@ -112,4 +112,11 @@ config LEDS_TRIGGER_MORSE - tristate "LED Morse Trigger" - depends on LEDS_TRIGGERS +@@ -108,4 +108,11 @@ config LEDS_TRIGGER_CAMERA + This enables direct flash/torch on/off by the driver, kernel space. + If unsure, say Y. +config LEDS_TRIGGER_NETDEV + tristate "LED Netdev Trigger" @@ -14,8 +14,8 @@ endif # LEDS_TRIGGERS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -66,3 +66,4 @@ obj-$(CONFIG_LEDS_DAC124S085) += leds-d +@@ -65,3 +65,4 @@ obj-$(CONFIG_LEDS_DAC124S085) += leds-d + # LED Triggers obj-$(CONFIG_LEDS_TRIGGERS) += trigger/ - obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o +obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o diff --git a/target/linux/generic/patches-4.1/832-ledtrig_usbdev.patch b/target/linux/generic/patches-4.1/832-ledtrig_usbdev.patch index 564aab5d9a..b83efd29bf 100644 --- a/target/linux/generic/patches-4.1/832-ledtrig_usbdev.patch +++ b/target/linux/generic/patches-4.1/832-ledtrig_usbdev.patch @@ -1,6 +1,6 @@ --- a/drivers/leds/trigger/Kconfig +++ b/drivers/leds/trigger/Kconfig -@@ -119,4 +119,11 @@ config LEDS_TRIGGER_NETDEV +@@ -115,4 +115,11 @@ config LEDS_TRIGGER_NETDEV This allows LEDs to be controlled by network device activity. If unsure, say Y. @@ -14,9 +14,9 @@ endif # LEDS_TRIGGERS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -67,3 +67,4 @@ obj-$(CONFIG_LEDS_DAC124S085) += leds-d +@@ -66,3 +66,4 @@ obj-$(CONFIG_LEDS_DAC124S085) += leds-d + # LED Triggers obj-$(CONFIG_LEDS_TRIGGERS) += trigger/ - obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o +obj-$(CONFIG_LEDS_TRIGGER_USBDEV) += ledtrig-usbdev.o --- a/drivers/leds/ledtrig-usbdev.c |