From patchwork Thu Jul 23 06:31:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 6851461 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 037DBC05AC for ; Thu, 23 Jul 2015 06:31:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35AC1205B5 for ; Thu, 23 Jul 2015 06:31:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2772F20576 for ; Thu, 23 Jul 2015 06:31:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751159AbbGWGbx (ORCPT ); Thu, 23 Jul 2015 02:31:53 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:60696 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750842AbbGWGbw (ORCPT ); Thu, 23 Jul 2015 02:31:52 -0400 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 133F2140A76; Thu, 23 Jul 2015 06:31:52 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id F2327140A78; Thu, 23 Jul 2015 06:31:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from potku.com (a88-115-185-251.elisa-laajakaista.fi [88.115.185.251]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: kvalo@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id CD4DB140A76 for ; Thu, 23 Jul 2015 06:31:50 +0000 (UTC) From: Kalle Valo To: linux-wireless@vger.kernel.org Subject: [PATCH] bcma: fix linking problem with of_default_bus_match_table Date: Thu, 23 Jul 2015 09:31:44 +0300 Message-Id: <1437633104-23373-1-git-send-email-kvalo@codeaurora.org> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Stephen reported a build problem caused by commit cae761b5a6bd ("bcma: populate bus DT subnodes as platform_device-s"): ERROR: "of_default_bus_match_table" [drivers/bcma/bcma.ko] undefined! Rafa? Mi?ecki suggested as a quick fix to use IS_BUILTIN() to workaround the issue. The downside is that this won't work when BCMA is compiled as a module, but we can live with that for now just to unblock the breakage. Reported-by: Stephen Rothwell Fixes: cae761b5a6bd ("bcma: populate bus DT subnodes as platform_device-s") Signed-off-by: Kalle Valo --- drivers/bcma/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 59128478a90f..6b7d54622058 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c @@ -410,7 +410,7 @@ int bcma_bus_register(struct bcma_bus *bus) bcma_core_pci_early_init(&bus->drv_pci[0]); } - if (bus->host_pdev) { + 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,