From patchwork Tue Sep 1 15:09:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 264723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EE32C433E6 for ; Tue, 1 Sep 2020 15:40:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 56EF220767 for ; Tue, 1 Sep 2020 15:40:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598974829; bh=pcV0oajEnpm+aZV6RyAIZ2HIm69x7JgW03C8QV9BoQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=a6zRgBDw2qQmckjIFBMBab5lQTcBcaj7mFwaQA1zemiQvfHm/v8SRUffDQ5czEryB dNzajwePRc157pgjyL/QskQbLfxuTP0TcpVShsRdbCrj9HQg+Ke2GNXYz8/Osj4xov p1dVCzUFuKIDu35m0xzpRbZZNVA6xydUPoxSAS80= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731495AbgIAPk1 (ORCPT ); Tue, 1 Sep 2020 11:40:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:51586 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729063AbgIAPk0 (ORCPT ); Tue, 1 Sep 2020 11:40:26 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C674920866; Tue, 1 Sep 2020 15:40:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598974826; bh=pcV0oajEnpm+aZV6RyAIZ2HIm69x7JgW03C8QV9BoQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AR5j3FWhmkb/xGv9yYe7bNHf3LPKT++jAsPt7f01xRgRCT9OzZ98m6RgO8j81oOde 63ZUHdk/XgDn7dGHl9vbD1W3K6mJCICdIdEHYDJkNtPlIG7Km+rvpiUUyNTs0INE7R 6VRA86pL/1FscSKlqj3NQHvatFCtG6b+GwWlfWvg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Ellerman , Bartlomiej Zolnierkiewicz , Sasha Levin Subject: [PATCH 5.8 105/255] video: fbdev: controlfb: Fix build for COMPILE_TEST=y && PPC_PMAC=n Date: Tue, 1 Sep 2020 17:09:21 +0200 Message-Id: <20200901151005.744355680@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200901151000.800754757@linuxfoundation.org> References: <20200901151000.800754757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michael Ellerman [ Upstream commit 4d618b9f3fcab84e9ec28c180de46fb2c929d096 ] The build is currently broken, if COMPILE_TEST=y and PPC_PMAC=n: linux/drivers/video/fbdev/controlfb.c: In function ‘control_set_hardware’: linux/drivers/video/fbdev/controlfb.c:276:2: error: implicit declaration of function ‘btext_update_display’ 276 | btext_update_display(p->frame_buffer_phys + CTRLFB_OFF, | ^~~~~~~~~~~~~~~~~~~~ Fix it by including btext.h whenever CONFIG_BOOTX_TEXT is enabled. Fixes: a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support") Signed-off-by: Michael Ellerman Acked-by: Bartlomiej Zolnierkiewicz Link: https://lore.kernel.org/r/20200821104910.3363818-1-mpe@ellerman.id.au Signed-off-by: Sasha Levin --- drivers/video/fbdev/controlfb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c index 9c4f1be856eca..547abeb39f87a 100644 --- a/drivers/video/fbdev/controlfb.c +++ b/drivers/video/fbdev/controlfb.c @@ -49,6 +49,8 @@ #include #ifdef CONFIG_PPC_PMAC #include +#endif +#ifdef CONFIG_BOOTX_TEXT #include #endif