From patchwork Mon Aug 28 09:32:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 9925007 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4B93F60311 for ; Mon, 28 Aug 2017 09:32:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4633128698 for ; Mon, 28 Aug 2017 09:32:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AA7D2869D; Mon, 28 Aug 2017 09:32:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C0A0C28698 for ; Mon, 28 Aug 2017 09:32:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:To:From:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=2H3peHULuFcZqNXgVObV7+ftY5MVH4ZAYSYh0OQwBZQ=; b=JNc /UinQHrhKoeUYHiBTQJDbUEiE8OKw6Fp9PVI9U/5HYuBhIYvjVndC7C+dMvljtrlI0Wfvvs7TPq6u hgpNBczQb6DqUa/9lkPfh/9o+qcj3betoqlByA1Ju069saTqZxkSQ4Xi2jXohdxR/J0yLgQCB/2VA AeXHEkGf+/UHe8kgmwDqsPzKiCilOpUxgDshuBgVv2+v6DIOxvfBj3m5r8kBBGDPjD083uSGZ/fZh k2wycbWwdeJXgD+WhwdgdFeidbTE4n27GKecl/1RoV08rsbkVI7R7xLrGS66bJQQba4Q+F7L1V/oN mQ3LEDZ+J1J6avEftQUxMCZMs777YRw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dmGPV-0006Yr-42; Mon, 28 Aug 2017 09:32:45 +0000 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dmGPO-0006S1-H9 for linux-arm-kernel@lists.infradead.org; Mon, 28 Aug 2017 09:32:42 +0000 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 21C7E8238F; Mon, 28 Aug 2017 11:32:08 +0200 (CEST) Date: Mon, 28 Aug 2017 11:32:07 +0200 From: Pavel Machek To: pali.rohar@gmail.com, sre@kernel.org, kernel list , linux-arm-kernel , linux-omap@vger.kernel.org, tony@atomide.com, khilman@kernel.org, aaro.koskinen@iki.fi, ivo.g.dimitrov.75@gmail.com, patrikbachan@gmail.com, serge@hallyn.com, abcloriens@gmail.com Subject: [PATCH linux-next] fix compilation error in mach-omap2/display.c Message-ID: <20170828093207.GA29080@amd> MIME-Version: 1.0 User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170828_023238_875668_26B8152A X-CRM114-Status: GOOD ( 11.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In linux-next 0828, I get CC arch/arm/mach-omap2/display.o arch/arm/mach-omap2/display.c: In function 'omapdss_init_fbdev': arch/arm/mach-omap2/display.c:184:2: error: 'r' undeclared (first Fix it. Signed-off-by: Pavel Machek diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 798fc71..b3f6eb5 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -172,6 +172,7 @@ static int __init omapdss_init_fbdev(void) .set_min_bus_tput = omap_dss_set_min_bus_tput, }; struct device_node *node; + int r; board_data.version = omap_display_get_version(); if (board_data.version == OMAPDSS_VER_UNKNOWN) {