projects
/
15.05
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f0e2ee
)
ubsec_ssb: fix build of ubsec_ssb with new ssb patches
author
Hauke Mehrtens
<hauke@openwrt.org>
Thu, 22 Jul 2010 18:50:32 +0000
(18:50 +0000)
committer
Hauke Mehrtens
<hauke@openwrt.org>
Thu, 22 Jul 2010 18:50:32 +0000
(18:50 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22357
3c298f89
-4303-0410-b956-
a3cf2f4a3e73
package/ubsec_ssb/src/ubsec_ssb.c
patch
|
blob
|
history
diff --git
a/package/ubsec_ssb/src/ubsec_ssb.c
b/package/ubsec_ssb/src/ubsec_ssb.c
index
86f8dad
..
d6adf59
100644
(file)
--- a/
package/ubsec_ssb/src/ubsec_ssb.c
+++ b/
package/ubsec_ssb/src/ubsec_ssb.c
@@
-503,7
+503,12
@@
__devinit ubsec_ssb_probe(struct ssb_device *sdev,
goto err_out_powerdown;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+ err = dma_set_mask(sdev->dma_dev, DMA_BIT_MASK(32)) ||
+ dma_set_coherent_mask(sdev->dma_dev, DMA_BIT_MASK(32));
+#else
err = ssb_dma_set_mask(sdev, DMA_32BIT_MASK);
+#endif
if (err) {
dev_err(sdev->dev,
"Required 32BIT DMA mask unsupported by the system.\n");