diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
| commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
| tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /drivers/net/wireless | |
| parent | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff) | |
| parent | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/prism54/islpci_mgt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c index 4937a5ad4b2c..6a60c5970cb5 100644 --- a/drivers/net/wireless/prism54/islpci_mgt.c +++ b/drivers/net/wireless/prism54/islpci_mgt.c | |||
| @@ -137,7 +137,7 @@ islpci_mgmt_rx_fill(struct net_device *ndev) | |||
| 137 | PCI_DMA_FROMDEVICE); | 137 | PCI_DMA_FROMDEVICE); |
| 138 | if (!buf->pci_addr) { | 138 | if (!buf->pci_addr) { |
| 139 | printk(KERN_WARNING | 139 | printk(KERN_WARNING |
| 140 | "Failed to make memory DMA'able\n."); | 140 | "Failed to make memory DMA'able.\n"); |
| 141 | return -ENOMEM; | 141 | return -ENOMEM; |
| 142 | } | 142 | } |
| 143 | } | 143 | } |