bcma: fix build error when build as module

Currently of_default_bus_match_table is not exported so we can only use
this feature when bcma is build into the kernel. This patch removes
support for child buses when bcma is build as a module as a temporary
fix for a build problem introduces in this commit:

commit cae761b5a6bdc597ba476a040fdcd5b4bc559b85
Author: Rafał Miłecki <[email protected]>
Date:   Sun Jun 28 17:17:13 2015 +0200

    bcma: populate bus DT subnodes as platform_device-s

Reported-by: Stephen Rothwell <[email protected]>
Fixes: cae761b5a6bd ("bcma: populate bus DT subnodes as platform_device-s")
Signed-off-by: Hauke Mehrtens <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 59128478a90fd3200c131be97225b8d97eb8763d..8d973c4fc84e3185af77b6c4da0a64103be2e7b9 100644 (file)
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -410,7 +410,11 @@ int bcma_bus_register(struct bcma_bus *bus)
                bcma_core_pci_early_init(&bus->drv_pci[0]);
        }
 
-       if (bus->host_pdev) {
+       /* TODO: remove check for IS_BUILTIN(CONFIG_BCMA) check when
+        * of_default_bus_match_table is exported or in some other way
+        * accessible. This is just a temporary workaround.
+        */
+       if (IS_BUILTIN(CONFIG_BCMA) && bus->host_pdev) {
                struct device *dev = &bus->host_pdev->dev;
 
                of_platform_populate(dev->of_node, of_default_bus_match_table,