diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-11-24 22:19:24 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-24 22:19:24 +0100 |
| commit | d7a066c92394f3e777351de0c903beeb8a08af76 (patch) | |
| tree | f54ce8ac77d32b4c3166b4a2ca92525174a3213b /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
| parent | Revert "nl80211/mac80211: Report signal average" (diff) | |
| parent | wireless: b43: fix error path in SDIO (diff) | |
| download | linux-d7a066c92394f3e777351de0c903beeb8a08af76.tar.xz linux-d7a066c92394f3e777351de0c903beeb8a08af76.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index c3ebc04cbd00..8eb1393506bc 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -3997,7 +3997,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e * "the hard way", rather than using device's scan. */ if (iwl3945_mod_params.disable_hw_scan) { - IWL_ERR(priv, "sw scan support is deprecated\n"); + dev_printk(KERN_DEBUG, &(pdev->dev), + "sw scan support is deprecated\n"); iwl3945_hw_ops.hw_scan = NULL; } |