From patchwork Wed Nov 14 09:41:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Glauber X-Patchwork-Id: 1740201 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 45878DF264 for ; Wed, 14 Nov 2012 09:43:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161003Ab2KNJmq (ORCPT ); Wed, 14 Nov 2012 04:42:46 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:45830 "EHLO e06smtp11.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932879Ab2KNJmi (ORCPT ); Wed, 14 Nov 2012 04:42:38 -0500 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 14 Nov 2012 09:42:36 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 14 Nov 2012 09:42:33 -0000 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qAE9gPJ762259372; Wed, 14 Nov 2012 09:42:25 GMT Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qAE9gVZs028471; Wed, 14 Nov 2012 02:42:32 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qAE9gOBW028037; Wed, 14 Nov 2012 02:42:29 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 45614) id A9908122443C; Wed, 14 Nov 2012 10:42:28 +0100 (CET) From: Jan Glauber To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, heiko.carstens@de.ibm.com, schwidefsky@de.ibm.com, Jan Glauber Subject: [RFC PATCH 10/10] vga: compile fix, disable vga for s390 Date: Wed, 14 Nov 2012 10:41:42 +0100 Message-Id: <65c7c355e98193fbf866edc3edfe429d5f59047e.1352719878.git.jang@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: References: In-Reply-To: References: x-cbid: 12111409-5024-0000-0000-0000045AFA9B Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Signed-off-by: Jan Glauber --- drivers/gpu/vga/Kconfig | 2 +- include/video/vga.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig index f348388..29437ea 100644 --- a/drivers/gpu/vga/Kconfig +++ b/drivers/gpu/vga/Kconfig @@ -1,7 +1,7 @@ config VGA_ARB bool "VGA Arbitration" if EXPERT default y - depends on PCI + depends on (PCI && !S390) help Some "legacy" VGA devices implemented on PCI typically have the same hard-decoded addresses as they did on ISA. When multiple PCI devices diff --git a/include/video/vga.h b/include/video/vga.h index cac567f..7978d31 100644 --- a/include/video/vga.h +++ b/include/video/vga.h @@ -19,7 +19,9 @@ #include #include +#ifndef __s390x__ #include +#endif #include