---

yaml --- r: 314872 b: refs/heads/master c: 011ad0e h: refs/heads/master v: v3
git-mirror · Jun 24, 2012 · ed09f5f · ed09f5f
1 parent 938c4d5
commit ed09f5f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdcbd8e0e3ffdad32b14b6373e67bfcf5fd3f002
+refs/heads/master: 011ad0e9f8533cd003fb760663713df2655a2114
diff --git a/trunk/net/mac80211/Makefile b/trunk/net/mac80211/Makefile
@@ -24,7 +24,7 @@ mac80211-y := \
 	wme.o \
 	event.o \
 	chan.o \
-	driver-trace.o mlme.o
+	trace.o mlme.o
 
 mac80211-$(CONFIG_MAC80211_LEDS) += led.o
 mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
@@ -42,7 +42,7 @@ mac80211-$(CONFIG_MAC80211_MESH) += \
 
 mac80211-$(CONFIG_PM) += pm.o
 
-CFLAGS_driver-trace.o := -I$(src)
+CFLAGS_trace.o := -I$(src)
 
 # objects for PID algorithm
 rc80211_pid-y := rc80211_pid_algo.o

diff --git a/trunk/net/mac80211/driver-ops.h b/trunk/net/mac80211/driver-ops.h
@@ -3,7 +3,7 @@
 
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
-#include "driver-trace.h"
+#include "trace.h"
 
 static inline void check_sdata_in_driver(struct ieee80211_sub_if_data *sdata)
 {

diff --git a/trunk/net/mac80211/offchannel.c b/trunk/net/mac80211/offchannel.c
@@ -15,7 +15,6 @@
 #include <linux/export.h>
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
-#include "driver-trace.h"
 #include "driver-ops.h"
 
 /*

diff --git a/trunk/net/mac80211/driver-trace.c → trunk/net/mac80211/trace.c b/trunk/net/mac80211/driver-trace.c → trunk/net/mac80211/trace.c
@@ -5,5 +5,5 @@
 #ifndef __CHECKER__
 #include "driver-ops.h"
 #define CREATE_TRACE_POINTS
-#include "driver-trace.h"
+#include "trace.h"
 #endif
diff --git a/trunk/net/mac80211/driver-trace.h → trunk/net/mac80211/trace.h b/trunk/net/mac80211/driver-trace.h → trunk/net/mac80211/trace.h
@@ -1637,5 +1637,5 @@ TRACE_EVENT(stop_queue,
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH .
 #undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE driver-trace
+#define TRACE_INCLUDE_FILE trace
 #include <trace/define_trace.h>