diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-10 22:15:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-10 22:15:31 -0800 |
| commit | 8877870f8a8127b653f8c9a55c6b4de9f96f639b (patch) | |
| tree | cc2629911f6b011ee2e3f4a85febbb9b6cc63604 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
| parent | 7a1abd08d52fdeddb3e9a5a33f2f15cc6a5674d2 (diff) | |
| parent | 7379efeacb707f49729080791a7a562d8996aec4 (diff) | |
| download | op-kernel-dev-8877870f8a8127b653f8c9a55c6b4de9f96f639b.zip op-kernel-dev-8877870f8a8127b653f8c9a55c6b4de9f96f639b.tar.gz | |
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 8f8c4b7..7edf8c2 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -4000,7 +4000,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; } |
