backports: remove ath5k trace fix patch
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>
Sat, 11 May 2013 00:26:57 +0000 (17:26 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 13 May 2013 11:19:39 +0000 (13:19 +0200)
This is no longer required thanks to commit cc5569f6
present on next-20130415.

commit cc5569f63ecb82965f3fe2fde5e60bf1689d107a
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Thu Apr 11 16:22:08 2013 +0200

    ath5k: use more idiomatic tracing include style

    Pretty much everywhere that uses a trace definition
    header that's not in include/trace/events/ uses the
    make system for the include path rather than putting
    it into the sources, so do that in ath5k as well.

    This came up during backporting work (where this is
    required), but since all other drivers do it this
    way upstream it seemed applicable.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
patches/collateral-evolutions/network/73-ath5k-tracing/ath5k.patch [deleted file]

diff --git a/patches/collateral-evolutions/network/73-ath5k-tracing/ath5k.patch b/patches/collateral-evolutions/network/73-ath5k-tracing/ath5k.patch
deleted file mode 100644 (file)
index 1adb3f9..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/net/wireless/ath/ath5k/trace.h
-+++ b/drivers/net/wireless/ath/ath5k/trace.h
-@@ -97,7 +97,7 @@ TRACE_EVENT(ath5k_tx_complete,
- #if defined(CONFIG_ATH5K_TRACER) && !defined(__CHECKER__)
- #undef TRACE_INCLUDE_PATH
--#define TRACE_INCLUDE_PATH ../../drivers/net/wireless/ath/ath5k
-+#define TRACE_INCLUDE_PATH .
- #undef TRACE_INCLUDE_FILE
- #define TRACE_INCLUDE_FILE trace
---- a/drivers/net/wireless/ath/ath5k/Makefile
-+++ b/drivers/net/wireless/ath/ath5k/Makefile
-@@ -10,6 +10,7 @@ ath5k-y                              += phy.o
- ath5k-y                               += reset.o
- ath5k-y                               += attach.o
- ath5k-y                               += base.o
-+CFLAGS_base.o                 += -I$(src)
- ath5k-y                               += led.o
- ath5k-y                               += rfkill.o
- ath5k-y                               += ani.o