From patchwork Thu Oct 9 17:17:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5060091 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C888B9F349 for ; Thu, 9 Oct 2014 17:17:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 05C2A201FE for ; Thu, 9 Oct 2014 17:17:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 361C5201BC for ; Thu, 9 Oct 2014 17:17:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753236AbaJIRR4 (ORCPT ); Thu, 9 Oct 2014 13:17:56 -0400 Received: from mail-oi0-f44.google.com ([209.85.218.44]:41100 "EHLO mail-oi0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751168AbaJIRRy (ORCPT ); Thu, 9 Oct 2014 13:17:54 -0400 Received: by mail-oi0-f44.google.com with SMTP id x69so3872376oia.17 for ; Thu, 09 Oct 2014 10:17:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=mwRgVhZgzNLGUp8K8TN21bV+TkhXWo5VKz8VUt/xyTg=; b=o/Dh898GkqMvFpyMuxji35gvktfl/iQ6Nkx1wP79Nzh0CRQiWXcsq+7MOykHZG+Qbu Um5cTDPRQxKOfkL5HM1YuBWnVHRox731qFEcbywq4vEx9A2H+/bKTT6mx3MCYBUCZIsS Bs6S1k7IYrfRy0CuQThoXqDpdpZU+yoSZzeiuiNx+WBh3QxjN0PZ6R34VrbEKl6xirGQ LL5AMnVwsCCV0N9gKoQhCjPkFQaprQ2SGZTaGdOoq1P1wc9GRlKHmhgTfz4NpmhSpDcu A1t/joLSjggoAnKzs+MrkE+btfYbA6jKFYwAOxvtq2MVbkx9Rmv07kA79y6rrckVUVCf C/Ew== X-Received: by 10.182.128.34 with SMTP id nl2mr25166569obb.44.1412875074089; Thu, 09 Oct 2014 10:17:54 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id i1sm3910938oew.6.2014.10.09.10.17.53 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 09 Oct 2014 10:17:53 -0700 (PDT) From: Guenter Roeck To: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck , Hauke Mehrtens , Arnd Bergmann Subject: [PATCH v2] bcma: Add dependency on OF_ADDRESS Date: Thu, 9 Oct 2014 10:17:43 -0700 Message-Id: <1412875063-3576-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 2101e533f41a ("bcma: register bcma as device tree driver") introduces a hard dependency on OF_ADDRESS into the bcma driver. OF_ADDRESS is specifically disabled for the sparc architecture. This results in the following error when building sparc64:allmodconfig. drivers/bcma/main.c: In function 'bcma_of_find_child_device': drivers/bcma/main.c:150:3: error: implicit declaration of function 'of_translate_address' Only build the bcma driver if OF is not configured or if both OF and OF_ADDRESS are configured to solve the problem. Fixes: 2101e533f41a ("bcma: register bcma as device tree driver") Cc: Hauke Mehrtens Cc: Arnd Bergmann Signed-off-by: Guenter Roeck --- v2: Limit additional dependency to '!OF || OF_ADDRESS'. drivers/bcma/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig index 0ee48be..e240ef0 100644 --- a/drivers/bcma/Kconfig +++ b/drivers/bcma/Kconfig @@ -1,6 +1,6 @@ config BCMA_POSSIBLE bool - depends on HAS_IOMEM && HAS_DMA + depends on HAS_IOMEM && HAS_DMA && (!OF || OF_ADDRESS) default y menu "Broadcom specific AMBA"