From: David S. Miller <davem@davemloft.net>
Date: Sun, 29 Jun 2008 05:57:58 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles... 
X-Git-Tag: v2.6.27-rc1~969^2~254
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=28f49d8fec19833672a6a813bfde0068fee50bc9;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
---

28f49d8fec19833672a6a813bfde0068fee50bc9
diff --cc drivers/net/wireless/b43legacy/dma.c
index 203b0f42ac5,9736b2f56a7..eb0243a2269
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@@ -918,11 -916,12 +917,11 @@@ struct b43legacy_dmaring *b43legacy_set
  				goto err_kfree_txhdr_cache;
  		}
  
- 		dma_unmap_single(dev->dev->dma_dev,
- 				 dma_test, sizeof(struct b43legacy_txhdr_fw3),
- 				 DMA_TO_DEVICE);
+ 		ssb_dma_unmap_single(dev->dev, dma_test,
+ 				     sizeof(struct b43legacy_txhdr_fw3),
+ 				     DMA_TO_DEVICE);
  	}
  
 -	ring->dev = dev;
  	ring->nr_slots = nr_slots;
  	ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index);
  	ring->index = controller_index;