diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-25 21:10:27 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-07-26 14:53:37 +0300 |
| commit | 92ff7a698badec3938edd3ba6b3e3ae035555365 (patch) | |
| tree | 4457d6383976e7092d7cb8b9e4da28c817b85f1c /drivers/bcma | |
| parent | e79801ffe9c862597750359b8c6825f3a3bfaa4f (diff) | |
| download | lwn-92ff7a698badec3938edd3ba6b3e3ae035555365.tar.gz lwn-92ff7a698badec3938edd3ba6b3e3ae035555365.zip | |
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 <zajec5@gmail.com>
Date: Sun Jun 28 17:17:13 2015 +0200
bcma: populate bus DT subnodes as platform_device-s
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: cae761b5a6bd ("bcma: populate bus DT subnodes as platform_device-s")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/bcma')
| -rw-r--r-- | drivers/bcma/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 59128478a90f..8d973c4fc84e 100644 --- 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, |