Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933070Ab2HHV2u (ORCPT ); Wed, 8 Aug 2012 17:28:50 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:59916 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932631Ab2HHV2r (ORCPT ); Wed, 8 Aug 2012 17:28:47 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Andrew Lunn , Michael Walle , Nicolas Pitre Subject: [PATCH 03/10] ARM: mv78xx0: fix win_cfg_base prototype Date: Wed, 8 Aug 2012 23:27:51 +0200 Message-Id: <1344461278-28245-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1344461278-28245-1-git-send-email-arnd@arndb.de> References: <1344461278-28245-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:/+eqv20jl5yUgRncULsOGbjyLhPsTRXqIDZpkcN+K9m fOnqasBsyqQPQKM5iFbGme3S0xpqEwKoiJTU0yVLzDuYgybxsN Q7a77xV+0pNSV3VbOZKoQyVcTUnuzzxfyJRXJYAw7P6rubojut VOyhlfTfMvCp/zFa7Ivgx5JRiWRgI/KZLskHjxInV/aWe0lb6e yXA9+BT0N/Xowk0rUeolJztSiPriBQyIesh/Bko8KXOsklEMKU j00Dv+d23Hqb6n0zpAYpLJk4R18rhlyz+iq+HT0p6FpDQO+QRC +S7TG5aNcCB+d7+TPi19PY4aQImkrwqxpZpWS4MpyuncrRO2Jt TfZ3M3nGK+JB7vDvtUWg7/G0iED4HrueJuGg2FG5k4sKLLbvkd v+j1yYu5fhJkQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1631 Lines: 40 Patch b6d1c33a31 "ARM: Orion: Consolidate the address map setup" tried to merge the address map for the four orion platforms, but apparently got it wrong for mv78xx0. Admittedly I don't understand what this code actually does, but it's clear that the current version is wrong. Without this patch, building mv78xx0_defconfig results in: arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: initialization from incompatible pointer type [enabled by default] arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: (near initialization for 'addr_map_cfg.win_cfg_base') [enabled by default] Signed-off-by: Arnd Bergmann Cc: Andrew Lunn Cc: Michael Walle Cc: Nicolas Pitre --- arch/arm/mach-mv78xx0/addr-map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c index 62b53d7..a9bc841 100644 --- a/arch/arm/mach-mv78xx0/addr-map.c +++ b/arch/arm/mach-mv78xx0/addr-map.c @@ -37,7 +37,7 @@ #define WIN0_OFF(n) (BRIDGE_VIRT_BASE + 0x0000 + ((n) << 4)) #define WIN8_OFF(n) (BRIDGE_VIRT_BASE + 0x0900 + (((n) - 8) << 4)) -static void __init __iomem *win_cfg_base(int win) +static void __init __iomem *win_cfg_base(const struct orion_addr_map_cfg *cfg, int win) { /* * Find the control register base address for this window. -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/