From patchwork Mon Apr 27 21:32:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47647 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2445620553 for ; Mon, 27 Apr 2015 21:45:38 +0000 (UTC) Received: by laat2 with SMTP id t2sf29865881laa.2 for ; Mon, 27 Apr 2015 14:45:36 -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: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=yJy7XnV6NjNEKI38iko/wXPwTj4NmapJZWZIuReEq+s=; b=iA6vgHKCiwnSlDBU3xqUGMmQ3luTY4fztBCBX6ZtpgPdF73gc83YC6Y/O2b/wZqwoQ 0bghNi7s0sXfGxm2Qhd6zCc3mU5T14Jkpt8zK5gZA32dteFlitIfbZDlvge6IR3GHELW 733H+D8Z+jrJDYi12ANg9RsWTEDM3zP+TeUsfes+fN9rw4KPnQADiNf/PHQMzPYscjpa uW+O/wItC+/4z07CFOvZNn6K0K2w1d5keBGHgoyFuk5Dc8u++ma+Kl/z7uzsYJhlzkj5 LKF9ZdhqigSv1YVqAj3Oj4KEY39/n2vVb0FLX8H8XYB3eH5+KHBT4WWQaNowMRYJglE9 jIGQ== X-Gm-Message-State: ALoCoQnvXW1aeKYHGP86MP/4/2i5e/vCN6Z+gYgVYxIRghfNb0mJgL3M6fnFTjOdtxMWn0Dq79jg X-Received: by 10.152.87.140 with SMTP id ay12mr8501385lab.8.1430171136736; Mon, 27 Apr 2015 14:45:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.227 with SMTP id kt3ls244lac.18.gmail; Mon, 27 Apr 2015 14:45:36 -0700 (PDT) X-Received: by 10.153.7.66 with SMTP id da2mr11621359lad.94.1430171136462; Mon, 27 Apr 2015 14:45:36 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id ko5si15643516lbb.43.2015.04.27.14.45.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Apr 2015 14:45:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbbzk7 with SMTP id zk7so92919970lbb.0 for ; Mon, 27 Apr 2015 14:45:36 -0700 (PDT) X-Received: by 10.152.27.1 with SMTP id p1mr11621096lag.112.1430171136342; Mon, 27 Apr 2015 14:45:36 -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 l1csp1523873lbt; Mon, 27 Apr 2015 14:45:35 -0700 (PDT) X-Received: by 10.70.136.67 with SMTP id py3mr26070966pdb.112.1430171134370; Mon, 27 Apr 2015 14:45:34 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id jz6si31640834pad.78.2015.04.27.14.45.33; Mon, 27 Apr 2015 14:45:34 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S965574AbbD0Vnm (ORCPT + 27 others); Mon, 27 Apr 2015 17:43:42 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:49675 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753332AbbD0Vc6 (ORCPT ); Mon, 27 Apr 2015 17:32:58 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1Ymqe8-0003z0-1j; Mon, 27 Apr 2015 23:32:56 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Mark Brown , Tomi Valkeinen , Jiri Slaby Subject: [PATCH 3.12 51/83] video: vgacon: Don't build on arm64 Date: Mon, 27 Apr 2015 23:32:22 +0200 Message-Id: <1d458a6ccc6c610cc8ae46a96c20fc0b9cdce4e2.1430159990.git.jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <3426bb8de3a655aa6668e92ee92eb35f0db86582.1430159990.git.jslaby@suse.cz> References: <3426bb8de3a655aa6668e92ee92eb35f0db86582.1430159990.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.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.173 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 3.12-stable review patch. If anyone has any objections, please let me 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