aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-10-31 21:55:21 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-10-31 21:55:21 +0000
commit26e68b353f0137aa08d2bbc18c33e011dfa3a571 (patch)
treea8ee2fa284b7d6b20e80af1e027303f795f44422
parente770d60e4713fdd8b68334abacb5ae3042f1cf72 (diff)
downloadupstream-26e68b353f0137aa08d2bbc18c33e011dfa3a571.tar.gz
upstream-26e68b353f0137aa08d2bbc18c33e011dfa3a571.tar.bz2
upstream-26e68b353f0137aa08d2bbc18c33e011dfa3a571.zip
mac80211: remove unused patch
This patch added stuff that is already there and if it would be needed this would result in a compile error. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 43131
-rw-r--r--package/kernel/mac80211/patches/004-backports-add-led_trigger_blink-_oneshot.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/package/kernel/mac80211/patches/004-backports-add-led_trigger_blink-_oneshot.patch b/package/kernel/mac80211/patches/004-backports-add-led_trigger_blink-_oneshot.patch
deleted file mode 100644
index 8d97224a6a..0000000000
--- a/package/kernel/mac80211/patches/004-backports-add-led_trigger_blink-_oneshot.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 88e75363ff9c00cc2e7768ca23ded79bf8d6bf08 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Fri, 7 Feb 2014 19:13:11 +0100
-Subject: [PATCH 1/8] backports: add led_trigger_blink{_oneshot}()
-
-When led support is deactivated in the kernel and
-CPTCFG_BACKPORT_BUILD_LEDS is set mac80211 references
-led_trigger_blink_oneshot() but it is not declared anywhere.
-
-This fixes the following build error:
-net/mac80211/led.c: In function 'ieee80211_led_rx':
-net/mac80211/led.c:25:2: error: implicit declaration of function 'led_trigger_blink_oneshot' [-Werror=implicit-function-declaration]
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- backport-include/backport/leds-disabled.h | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/backport-include/backport/leds-disabled.h
-+++ b/backport-include/backport/leds-disabled.h
-@@ -176,6 +176,19 @@ static inline void led_trigger_blink_one
- int invert)
- {
- }
-+
-+static inline void led_trigger_blink(struct led_trigger *trigger,
-+ unsigned long *delay_on,
-+ unsigned long *delay_off)
-+{
-+}
-+
-+static inline void led_trigger_blink_oneshot(struct led_trigger *trigger,
-+ unsigned long *delay_on,
-+ unsigned long *delay_off,
-+ int invert)
-+{
-+}
- #endif
-
- #endif /* __BACKPORT_LED_DISABLED_SUPPORT */