Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / bcma / core.c

diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
index 4a04a49..189a97b 100644 (file)
--- a/drivers/bcma/core.c
+++ b/drivers/bcma/core.c
@@ -110,6 +110,8 @@ EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);
 u32 bcma_core_dma_translation(struct bcma_device *core)
 {
        switch (core->bus->hosttype) {
+       case BCMA_HOSTTYPE_SOC:
+               return 0;
        case BCMA_HOSTTYPE_PCI:
                if (bcma_aread32(core, BCMA_IOST) & BCMA_IOST_DMA64)
                        return BCMA_DMA_TRANSLATION_DMA64_CMT;