From patchwork Thu Apr 23 07:21:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47446 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9323F21550 for ; Thu, 23 Apr 2015 07:28:51 +0000 (UTC) Received: by wixv7 with SMTP id v7sf17238251wix.0 for ; Thu, 23 Apr 2015 00:28:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=M5ihBjfVLslCSmUDrgaGpm3Hx09HEO29ZdhpfVfaa7A=; b=jFT2S/96FzpWgBUwQp3UWy2JN41MDKDqvregiSztYyR79Cz2BWXHLMrGA9l7/V3vir Ztm+u7ANfImjQ0Diy4Fb5Ohb0kWot14QKITWmNSFV0oIl0Jpy8eHNpLG/CV8SW2xooMB uFq4ub3jXY8hkMpqaVoxjXktFhYu9df1ekPVTEqlB0ibyJQI/C4sriKEEr77NPlX3X1S LV9zGFVEYwZCxOAxbRmageIALR1CMMT+2UzaEYpxxjN4xC7kgd4ZmT32KXAeGvZZkYoh aAlwVhIw4o4l/1Y+/NS8TiPZSWN+0Zd3qJG5cbz5zaqesoyHH3Uy+01UOqax3UobKMNa DuXg== X-Gm-Message-State: ALoCoQl4T+/GcSR4DGsUK9CyMWeA4GnRoeGjwP7lAdWFxUaP8Rm69LXmITV/173HwulN3u8Ia+gg X-Received: by 10.194.249.1 with SMTP id yq1mr758777wjc.2.1429774130910; Thu, 23 Apr 2015 00:28:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.131 with SMTP id s3ls272859las.65.gmail; Thu, 23 Apr 2015 00:28:50 -0700 (PDT) X-Received: by 10.112.234.163 with SMTP id uf3mr1297553lbc.9.1429774130786; Thu, 23 Apr 2015 00:28:50 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id rm3si5416659lbb.5.2015.04.23.00.28.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2015 00:28:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbbzk7 with SMTP id zk7so6891963lbb.0 for ; Thu, 23 Apr 2015 00:28:50 -0700 (PDT) X-Received: by 10.112.125.138 with SMTP id mq10mr1296500lbb.35.1429774130692; Thu, 23 Apr 2015 00:28:50 -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.112.67.65 with SMTP id l1csp400945lbt; Thu, 23 Apr 2015 00:28:50 -0700 (PDT) X-Received: by 10.70.98.233 with SMTP id el9mr2836285pdb.54.1429773723558; Thu, 23 Apr 2015 00:22:03 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nl4si11190826pbc.114.2015.04.23.00.22.02; Thu, 23 Apr 2015 00:22:03 -0700 (PDT) Received-SPF: none (google.com: stable-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 S1756016AbbDWHVw (ORCPT + 2 others); Thu, 23 Apr 2015 03:21:52 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:38995 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756098AbbDWHVc (ORCPT ); Thu, 23 Apr 2015 03:21:32 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YlBRy-00074L-Im; Thu, 23 Apr 2015 09:21:30 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Mark Brown , Tomi Valkeinen , Jiri Slaby Subject: [patch added to the 3.12 stable tree] video: vgacon: Don't build on arm64 Date: Thu, 23 Apr 2015 09:21:29 +0200 Message-Id: <1429773689-26866-51-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1429773689-26866-1-git-send-email-jslaby@suse.cz> References: <1429773689-26866-1-git-send-email-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 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: , From: Mark Brown This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== commit ee23794b86689e655cedd616e98c03bc3c74f5ec upstream. arm64 is unlikely to have a VGA console and does not export screen_info causing build failures if the driver is build, for example in all*config. Add a dependency on !ARM64 to prevent this. This list is getting quite long, it may be easier to depend on a symbol which architectures that do support the driver can select. Signed-off-by: Mark Brown [tomi.valkeinen@ti.com: moved && to first modified line] Signed-off-by: Tomi Valkeinen Signed-off-by: Jiri Slaby --- drivers/video/console/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 846caab75a46..fe1cd0148e13 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -8,7 +8,8 @@ config VGA_CONSOLE bool "VGA text console" if EXPERT || !X86 depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \ !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \ - (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) + (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ + !ARM64 default y help Saying Y here will allow you to use Linux in text mode through a