From patchwork Sat Apr 20 13:56:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 2468101 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 01EAFDF2A1 for ; Sat, 20 Apr 2013 14:39:08 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTYJ0-0006la-7w; Sat, 20 Apr 2013 13:58:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTYI2-0006YS-U5; Sat, 20 Apr 2013 13:57:18 +0000 Received: from mail-la0-x22b.google.com ([2a00:1450:4010:c03::22b]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTYHO-0006UE-2J for linux-arm-kernel@lists.infradead.org; Sat, 20 Apr 2013 13:56:39 +0000 Received: by mail-la0-f43.google.com with SMTP id ea20so815514lab.30 for ; Sat, 20 Apr 2013 06:56:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=bFJ6WliX9z6x3iz+Deodts3mWGemPWLoDAQCm2B7Yzw=; b=eUhHFB+0fk0QzoukDcRCvQHS+EDFu607LdSeNbyJrTvEjT4PXERLt6mqnAOIfLdD3f adqiOzVF7On4cDabOHkvSvqOzAULdJRZLf9QbQov+LW1Pe4sS9DVCWLyvsgVlKlhgb2m P6kfcSlt1k3QTX/JVR3Nv1sletLgyuJueclbZsgShYeU6M9G4K+yzbGhO515ksWDrQqn aGgrJjI2b0yBZ4B8ON6PwZnsJ4+/AZYwde8fv0tPbDrQN/4xySVKTT+u5DvbBbC76U6v AO8AYecupRLVg9XiAaN/HJGwBQqtXVBSdJCHqHgN4l98re4qPhwz3gDsD84ir3WRk0fp O/7g== X-Received: by 10.112.73.103 with SMTP id k7mr9954926lbv.40.1366466195535; Sat, 20 Apr 2013 06:56:35 -0700 (PDT) Received: from localhost.localdomain (c83-249-208-67.bredband.comhem.se. [83.249.208.67]) by mx.google.com with ESMTPS id v10sm7724840lae.9.2013.04.20.06.56.33 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 20 Apr 2013 06:56:34 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [RESEND PATCH 09/12] ARM: integrator: move VGA base assignment Date: Sat, 20 Apr 2013 15:56:32 +0200 Message-Id: <1366466192-15608-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.1.4 X-Gm-Message-State: ALoCoQmZ8V7wvvTiRMWUmGTYlbBk5xjinKWDpifC8fMwp6tfYbUbuNwLnatTFwI92uR7XAqS9dT8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130420_095638_313013_72931D58 X-CRM114-Status: GOOD ( 12.73 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Linus Walleij X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The global vga_base is used for things like getting an early console on a PCI-based VGA adapter. Move this assignment into the probe function for the PCI bridge. Acked-by: Arnd Bergmann Signed-off-by: Linus Walleij --- arch/arm/mach-integrator/integrator_ap.c | 2 -- arch/arm/mach-integrator/pci_v3.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 9b2d28b..fe1ee7c0 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -41,7 +41,6 @@ #include #include #include -#include