From patchwork Fri Aug 1 14:43:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pawel Moll X-Patchwork-Id: 34704 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 42915202A1 for ; Fri, 1 Aug 2014 14:45:11 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lf10sf28244351pab.1 for ; Fri, 01 Aug 2014 07:45:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=p5Uj/KJ8iPTkHMBcedr2+5U/yaFVG46Eko6BdVZT0eg=; b=nHrtCZXm77xbERKM9PpjF9rObPCHB2w9hj80bxDFnEjsU//L/QDnL2akjrgvOwhxtW RBA6I7R1j1S4GaY43WVW5ezzpoxfXLhPSLQf+miQKEkpprA3jv/UkjRH0hT8cHQooWKQ I2yBdwTjKlXnCTF+HC2kdnT8iHFoORtNXf+ee55cBTu0woy+FFngwKvjzCmHF2i0M48E pmUBCmyCt130+7wTj2hx6PQX5/I88DjDuMeBnFyYD9iOmQsrv32bQP5d/Wb+Brihmy8I /XcKsreca+r7b/3BrNUqrebn3hI7ahtspTxGuxYyIXHCRxqpKSITJganMdqRliFN5WhJ yn5g== X-Gm-Message-State: ALoCoQnJb/Zb4v8RnirjmEh65a2+H/p476VpYH3zlRQklVgh3ajdiYwytBPyawHrQvvguTQn1dPu X-Received: by 10.66.235.66 with SMTP id uk2mr2307859pac.39.1406904310586; Fri, 01 Aug 2014 07:45:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.132 with SMTP id o4ls1434959qga.40.gmail; Fri, 01 Aug 2014 07:45:10 -0700 (PDT) X-Received: by 10.221.25.210 with SMTP id rj18mr6801793vcb.5.1406904226482; Fri, 01 Aug 2014 07:43:46 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id cl2si7410107vcb.98.2014.08.01.07.43.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Aug 2014 07:43:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id la4so6864650vcb.19 for ; Fri, 01 Aug 2014 07:43:46 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr6854279vcb.0.1406904226390; Fri, 01 Aug 2014 07:43:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp116358vcb; Fri, 1 Aug 2014 07:43:45 -0700 (PDT) X-Received: by 10.70.43.206 with SMTP id y14mr6725079pdl.11.1406904225462; Fri, 01 Aug 2014 07:43:45 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id er15si3049168pad.106.2014.08.01.07.43.45 for ; Fri, 01 Aug 2014 07:43:45 -0700 (PDT) Received-SPF: none (google.com: linux-fbdev-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754335AbaHAOno (ORCPT ); Fri, 1 Aug 2014 10:43:44 -0400 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:53114 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754320AbaHAOno (ORCPT ); Fri, 1 Aug 2014 10:43:44 -0400 Received: from hornet.Cambridge.Arm.com (hornet.cambridge.arm.com [10.2.201.42]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 027DB13F638; Fri, 1 Aug 2014 09:43:32 -0500 (CDT) From: Pawel Moll To: Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org, fengguang.wu@intel.com, Pawel Moll Subject: [PATCH] video: ARM CLCD: Fix DT-related build problems Date: Fri, 1 Aug 2014 15:43:34 +0100 Message-Id: <1406904214-7360-1-git-send-email-pawel.moll@arm.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pawel.moll@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch fixes the following error when !CONFIG_OF: drivers/video/fbdev/amba-clcd.c:800:54: warning: ‘struct amba_dev’ declared inside parameter list [enabled by default] static struct clcd_board *clcdfb_of_get_board(struct amba_dev *dev) ^ and adds a missing Kconfig select causing this when CONFIG_OF && !CONFIG_FB_MODE_HELPERS: drivers/video/fbdev/amba-clcd.c:567: undefined reference to `fb_videomode_from_videomode' Reported-by: Fengguang Wu Signed-off-by: Pawel Moll --- Hi Tomi, This fixes two small problems detected in next by the kbuild test robot (thanks, Fengguang!) Hope you can apply it before the merge window. Cheers! Pawel drivers/video/fbdev/Kconfig | 1 + drivers/video/fbdev/amba-clcd.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index a518fe5..7eed249 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -280,6 +280,7 @@ config FB_ARMCLCD select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select FB_MODE_HELPERS if OF select VIDEOMODE_HELPERS if OF help This framebuffer device driver is for the ARM PrimeCell PL110 diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c index 23b3519..beadd3e 100644 --- a/drivers/video/fbdev/amba-clcd.c +++ b/drivers/video/fbdev/amba-clcd.c @@ -797,7 +797,7 @@ static struct clcd_board *clcdfb_of_get_board(struct amba_device *dev) return board; } #else -static struct clcd_board *clcdfb_of_get_board(struct amba_dev *dev) +static struct clcd_board *clcdfb_of_get_board(struct amba_device *dev) { return NULL; }