diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-24 16:35:40 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-24 16:35:40 -0400 |
| commit | 268bae0b6879f238ba57f5f801958d1254e136f7 (patch) | |
| tree | 132d1039370644b2c6a2d2f8903024de3e47b020 /drivers/net/wireless/p54/fwio.c | |
| parent | d70e96932de55fb2c05b1c0af1dff178651a9b77 (diff) | |
| parent | 6a017e043a8c5e4f1e7c1152bc6477da8066f5f6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6master-2010-08-24
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/p54/fwio.c')
| -rw-r--r-- | drivers/net/wireless/p54/fwio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c index 6f027ab4c77..92b9b1f05fd 100644 --- a/drivers/net/wireless/p54/fwio.c +++ b/drivers/net/wireless/p54/fwio.c @@ -125,7 +125,7 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw) if (fw_version) { wiphy_info(priv->hw->wiphy, - "fw rev %s - softmac protocol %x.%x\n", + "FW rev %s - Softmac protocol %x.%x\n", fw_version, priv->fw_var >> 8, priv->fw_var & 0xff); snprintf(dev->wiphy->fw_version, sizeof(dev->wiphy->fw_version), "%s - %x.%x", fw_version, |