From: Hauke Mehrtens Date: Thu, 22 Jul 2010 18:50:32 +0000 (+0000) Subject: ubsec_ssb: fix build of ubsec_ssb with new ssb patches X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=24d0a9a0694b50b25c0d633d5fea3733e7b42b7d;p=openwrt%2Fstaging%2Fjow.git ubsec_ssb: fix build of ubsec_ssb with new ssb patches SVN-Revision: 22357 --- 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");