summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/p54/txrx.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:35:40 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:35:40 -0400
commit268bae0b6879f238ba57f5f801958d1254e136f7 (patch)
tree132d1039370644b2c6a2d2f8903024de3e47b020 /drivers/net/wireless/p54/txrx.c
parentd70e96932de55fb2c05b1c0af1dff178651a9b77 (diff)
parent6a017e043a8c5e4f1e7c1152bc6477da8066f5f6 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/p54/txrx.c')
-rw-r--r--drivers/net/wireless/p54/txrx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index e53f8cec7798..34447d1ad80d 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -540,7 +540,7 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb)
case P54_TRAP_BEACON_TX:
break;
case P54_TRAP_RADAR:
- wiphy_info(priv->hw->wiphy, "radar (freq:%d mhz)\n", freq);
+ wiphy_info(priv->hw->wiphy, "radar (freq:%d MHz)\n", freq);
break;
case P54_TRAP_NO_BEACON:
if (priv->vif)