diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-03 13:39:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-03 13:39:16 -0400 |
| commit | 5c55c434917429f229a1bf43def97fd421f444c6 (patch) | |
| tree | ad299c2f5c63a560ce6c37b913bb60a791d5c1a3 /drivers/net | |
| parent | f778089cb2445dfc6dfd30a7a567925fd8589f1e (diff) | |
| parent | ee0a8169b693e1c708d0f9af0a5e4ade65a65439 (diff) | |
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c index d6d9413d7f23..6acfdc49dccd 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c | |||
| @@ -444,7 +444,7 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev, | |||
| 444 | u16 maxpower; | 444 | u16 maxpower; |
| 445 | 445 | ||
| 446 | if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) { | 446 | if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) { |
| 447 | printk(PFX KERN_ERR "TX power not in dBm.\n"); | 447 | printk(KERN_ERR PFX "TX power not in dBm.\n"); |
| 448 | return -EOPNOTSUPP; | 448 | return -EOPNOTSUPP; |
| 449 | } | 449 | } |
| 450 | 450 | ||