Merge branch 'wire-accept4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

[~andy/linux] / drivers / bcma / core.c

diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
index 4a04a49cc06d8dd375efbe1d36d211e9fff3fae7..893f6e0c759fa75f0831ad6fa157567ab31a71a1 100644 (file)
--- a/drivers/bcma/core.c
+++ b/drivers/bcma/core.c
@@ -6,6 +6,7 @@
  */
 
 #include "bcma_private.h"
+#include <linux/export.h>
 #include <linux/bcma/bcma.h>
 
 bool bcma_core_is_enabled(struct bcma_device *core)
@@ -110,6 +111,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;