aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-07-22 18:50:32 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-07-22 18:50:32 +0000
commit24d0a9a0694b50b25c0d633d5fea3733e7b42b7d (patch)
tree405a25b697655770b07b90afc45133f2da3b810d
parent8344c770fca75cc74ec6bd9a6eacfb9d9f0b8aa1 (diff)
downloadupstream-24d0a9a0694b50b25c0d633d5fea3733e7b42b7d.tar.gz
upstream-24d0a9a0694b50b25c0d633d5fea3733e7b42b7d.tar.bz2
upstream-24d0a9a0694b50b25c0d633d5fea3733e7b42b7d.zip
ubsec_ssb: fix build of ubsec_ssb with new ssb patches
SVN-Revision: 22357
-rw-r--r--package/ubsec_ssb/src/ubsec_ssb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/package/ubsec_ssb/src/ubsec_ssb.c b/package/ubsec_ssb/src/ubsec_ssb.c
index 86f8dadbea..d6adf596dd 100644
--- 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");