From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 11 Mar 2010 21:32:45 +0000 (+0100)
Subject: compat-wireless: fix building of iwmc3200wifi
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=021b3a6610573d399b8632a9e54ff4dc0cad18d3;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: fix building of iwmc3200wifi

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/patches/13-trace.patch b/patches/13-trace.patch
index 8c000f3f7c5f..82b2643d5e4a 100644
--- a/patches/13-trace.patch
+++ b/patches/13-trace.patch
@@ -23,6 +23,25 @@ in or compat headers.
 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
  #include <trace/define_trace.h>
 +#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 <linux/tracepoint.h>
++#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 <trace/define_trace.h>
++#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 @@