Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/ath/ath5k/trace.h b/drivers/net/wireless/ath/ath5k/trace.h
index 235e0768ce1d..c741c871f4e9 100644
--- a/drivers/net/wireless/ath/ath5k/trace.h
+++ b/drivers/net/wireless/ath/ath5k/trace.h
@@ -16,10 +16,10 @@ struct sk_buff;
 #define TRACE_SYSTEM ath5k
 
 TRACE_EVENT(ath5k_rx,
-        TP_PROTO(struct ath5k_softc *priv, struct sk_buff *skb),
+        TP_PROTO(struct ath5k_hw *priv, struct sk_buff *skb),
         TP_ARGS(priv, skb),
         TP_STRUCT__entry(
-                __field(struct ath5k_softc *, priv)
+                __field(struct ath5k_hw *, priv)
                 __field(unsigned long, skbaddr)
                 __dynamic_array(u8, frame, skb->len)
         ),
@@ -34,13 +34,13 @@ TRACE_EVENT(ath5k_rx,
 );
 
 TRACE_EVENT(ath5k_tx,
-        TP_PROTO(struct ath5k_softc *priv, struct sk_buff *skb,
+        TP_PROTO(struct ath5k_hw *priv, struct sk_buff *skb,
                  struct ath5k_txq *q),
 
         TP_ARGS(priv, skb, q),
 
         TP_STRUCT__entry(
-                __field(struct ath5k_softc *, priv)
+                __field(struct ath5k_hw *, priv)
                 __field(unsigned long, skbaddr)
                 __field(u8, qnum)
                 __dynamic_array(u8, frame, skb->len)
@@ -60,13 +60,13 @@ TRACE_EVENT(ath5k_tx,
 );
 
 TRACE_EVENT(ath5k_tx_complete,
-        TP_PROTO(struct ath5k_softc *priv, struct sk_buff *skb,
+        TP_PROTO(struct ath5k_hw *priv, struct sk_buff *skb,
                  struct ath5k_txq *q, struct ath5k_tx_status *ts),
 
         TP_ARGS(priv, skb, q, ts),
 
         TP_STRUCT__entry(
-                __field(struct ath5k_softc *, priv)
+                __field(struct ath5k_hw *, priv)
                 __field(unsigned long, skbaddr)
                 __field(u8, qnum)
                 __field(u8, ts_status)