From patchwork Sat Jul 7 08:48:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1168521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id E072B40239 for ; Sat, 7 Jul 2012 08:58:01 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SnQhA-0005pP-K5; Sat, 07 Jul 2012 08:48:52 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SnQh2-0005oW-Uq for linux-arm-kernel@lists.infradead.org; Sat, 07 Jul 2012 08:48:46 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0MEcaf-1Sc6x71gu9-00GSm6; Sat, 07 Jul 2012 10:48:32 +0200 From: Arnd Bergmann To: Russell King Subject: [PATCH 1/2] ARM: sa1100: add missing include of linux/io.h Date: Sat, 7 Jul 2012 08:48:30 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0-rc1+; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201207070848.30706.arnd@arndb.de> X-Provags-ID: V02:K0:XxMCVkbpS/RFbFAlgkOhponyyz4Th5erzmX8GDeVi2I Ht4CPrpFO8Jw4t1P+IpHMnxrah1z16tFhY7t91qopdNyTs/B0m B+y8ef3s8ke9skvub3lv7lnZgPtTddV5zFr6AqV90H6b/HntQ0 gzso7z7AJ3JbHIW/M4YAOYOyIAzaL4sBc1aGyBtBwx9r3i2XU6 v6bIHAty5xJnjYehF2cRqPtqsfwpgugV8S1Yc2fFv263MJmowu pl6tNrEqbexVwiQcRqyot6tgzwKgcIJzFFplAFIUCTMmR/V3Hm QbU5ZlA6u4xrolpWFAdlM0X0xoiLB1VbybiJmTd4RKl5745jYj iZ73Oyt4fS1v0CwnF2Gw= X-Spam-Note: CRM114 invocation failed 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 ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org After c00184f9ab4 "ARM: sa11x0/pxa: convert OS timer registers to IOMEM", pleb_defconfig produces this new warning: arch/arm/mach-sa1100/cpu-sa1100.c: In function 'sa1100_update_dram_timings': arch/arm/mach-sa1100/cpu-sa1100.c:153:3: error: implicit declaration of function 'IOMEM' Adding linux/io.h to the file using the __REG() macro avoids the warning. In the long run, we still need to convert the entire file to use readl/writel rather than directly derefencing the pointer, but this makes it compile again. Signed-off-by: Arnd Bergmann diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c index 19b2053..e8f4d1e 100644 --- a/arch/arm/mach-sa1100/cpu-sa1100.c +++ b/arch/arm/mach-sa1100/cpu-sa1100.c @@ -87,6 +87,7 @@ #include #include #include +#include #include