From b4f1fdc911225379dc36a220001c60d1c4bd5c19 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 23 Mar 2010 15:55:39 +0900 Subject: [PATCH] --- yaml --- r: 189451 b: refs/heads/master c: ed391f4ebf8f701d3566423ce8f17e614cde9806 h: refs/heads/master i: 189449: f541474f9dbb419724f6bcd342b5690107bca977 189447: 1a783bca227bb44ed3656aaf1c6b4e45049aaa6e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 ++ trunk/drivers/net/wireless/iwlwifi/iwl-devtrace.h | 1 - trunk/drivers/net/wireless/iwlwifi/iwl-io.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6ab98f9e5cbe..9addd091cb21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57f4c226d1e095a2db20c691c3cf089188fe1c5d +refs/heads/master: ed391f4ebf8f701d3566423ce8f17e614cde9806 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/trunk/drivers/net/wireless/iwlwifi/iwl-devtrace.c index 36580d8d8b8d..2ffc2edbf4f0 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-devtrace.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-devtrace.c @@ -28,6 +28,8 @@ /* sparse doesn't like tracepoint macros */ #ifndef __CHECKER__ +#include "iwl-dev.h" + #define CREATE_TRACE_POINTS #include "iwl-devtrace.h" diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/trunk/drivers/net/wireless/iwlwifi/iwl-devtrace.h index ff4d012ce260..ae7319bb3a99 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-devtrace.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-devtrace.h @@ -28,7 +28,6 @@ #define __IWLWIFI_DEVICE_TRACE #include -#include "iwl-dev.h" #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__) #undef TRACE_EVENT diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-io.h b/trunk/drivers/net/wireless/iwlwifi/iwl-io.h index c719baf2585a..16eb3ced9b30 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-io.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-io.h @@ -31,6 +31,7 @@ #include +#include "iwl-dev.h" #include "iwl-debug.h" #include "iwl-devtrace.h"