From b2a053895416213ea890700058fe87858b87f15b Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Wed, 7 Apr 2010 01:30:56 -0400 Subject: [PATCH] compat-wireless: remove 13-trace.patch, it's handled in compat now Signed-off-by: Pavel Roskin --- patches/13-trace.patch | 63 ------------------------------------------ 1 file changed, 63 deletions(-) delete mode 100644 patches/13-trace.patch diff --git a/patches/13-trace.patch b/patches/13-trace.patch deleted file mode 100644 index e3fee40f415e..000000000000 --- a/patches/13-trace.patch +++ /dev/null @@ -1,63 +0,0 @@ -Older kernels do not have trace/define_trace.h [1] and if there -is something there that we can backport we will define it -in or compat headers. - -[1] http://lxr.linux.no/#linux+v2.6.31/include/trace/define_trace.h - ---- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h -+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h -@@ -27,7 +27,9 @@ - #if !defined(__IWLWIFI_DEVICE_TRACE) || defined(TRACE_HEADER_MULTI_READ) - #define __IWLWIFI_DEVICE_TRACE - -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) - #include -+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) */ - - #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__) - #undef TRACE_EVENT -@@ -263,4 +265,6 @@ TRACE_EVENT(iwlwifi_dev_ucode_event, - #define TRACE_INCLUDE_PATH . - #undef TRACE_INCLUDE_FILE - #define TRACE_INCLUDE_FILE iwl-devtrace -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) - #include -+#endif ---- a/drivers/net/wireless/iwmc3200wifi/trace.h -+++ b/drivers/net/wireless/iwmc3200wifi/trace.h -@@ -1,7 +1,9 @@ - #if !defined(__IWM_TRACE_H__) || defined(TRACE_HEADER_MULTI_READ) - #define __IWM_TRACE_H__ - -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) - #include -+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) */ - - #if !defined(CONFIG_IWM_TRACING) - #undef TRACE_EVENT -@@ -280,4 +282,6 @@ TRACE_EVENT(iwm_rx_packet, - #define TRACE_INCLUDE_PATH . - #undef TRACE_INCLUDE_FILE - #define TRACE_INCLUDE_FILE trace -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) - #include -+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) */ ---- a/net/mac80211/driver-trace.h -+++ b/net/mac80211/driver-trace.h -@@ -1,7 +1,9 @@ - #if !defined(__MAC80211_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ) - #define __MAC80211_DRIVER_TRACE - -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) - #include -+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) */ - #include - #include "ieee80211_i.h" - -@@ -772,4 +774,6 @@ TRACE_EVENT(drv_flush, - #define TRACE_INCLUDE_PATH . - #undef TRACE_INCLUDE_FILE - #define TRACE_INCLUDE_FILE driver-trace -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) - #include -+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) */ -- 2.30.2