From patchwork Sat Jul 7 09:06:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1168551 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 0E2D13FC36 for ; Sat, 7 Jul 2012 09:09:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SnQyh-0007Lu-HG; Sat, 07 Jul 2012 09:06:59 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SnQyD-0007Lg-8z for linux-arm-kernel@lists.infradead.org; Sat, 07 Jul 2012 09:06:39 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MUjgO-1SJbS401IS-00YDN3; Sat, 07 Jul 2012 11:06:28 +0200 From: Arnd Bergmann To: Russell King Subject: [PATCH v2 1/2] ARM: sa1100: add missing include of linux/io.h Date: Sat, 7 Jul 2012 09:06:25 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0-rc1+; KDE/4.3.2; x86_64; ; ) References: <201207070848.30706.arnd@arndb.de> In-Reply-To: <201207070848.30706.arnd@arndb.de> MIME-Version: 1.0 Message-Id: <201207070906.26270.arnd@arndb.de> X-Provags-ID: V02:K0:l9EdlVwj0caFOQ/vSH0an2cus+0tzLpDFIQjRdJp56Q Fp5dntpVlez0nghWiuNiRO7pdn+tWdZLpjwUrG0kVc+T61lqcv KoFOGUmjFu9GkUtjxoAp9XLmj0LKABvfsvR4pLiI9Cxg9yTtNR nxrvDn05E0Cj/tNX1G9dvORHECEbkVVBApiRXH8Siw9v2wdzzw WDwPGqoF6OJzcH4PePhB4BHZv7hqLv9zs/6TLQxeV8bJYHmVyn KFGoFTuiPZ89H+VG58KDkQC6yKXLxuH9yJQrWsEW2IXsMTrZOY 6nmcuxU4TN8Zxmxso1W2yUWenrGyNw9dMUh0z7TrTPUu9HYP/F 60mUDdBym6bpXN8OBw/0= 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", multiple defconfig files produce 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 all register accesses to use readl/writel rather than directly derefencing the pointer, but this makes it compile again. Signed-off-by: Arnd Bergmann --- v2: actually fix all call sites, rather than just the first one We might want to put the #include directly into mach/SA-1100.h instead, to be on the safe side. 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 diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c index b412fc0..7f07f08 100644 --- a/arch/arm/mach-sa1100/jornada720_ssp.c +++ b/arch/arm/mach-sa1100/jornada720_ssp.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/mach-sa1100/leds-lart.c b/arch/arm/mach-sa1100/leds-lart.c index a51830c..50a5b14 100644 --- a/arch/arm/mach-sa1100/leds-lart.c +++ b/arch/arm/mach-sa1100/leds-lart.c @@ -10,6 +10,7 @@ * pace of the LED. */ #include +#include #include #include diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c index d9be6ea..7f03d1bd 100644 --- a/drivers/input/touchscreen/jornada720_ts.c +++ b/drivers/input/touchscreen/jornada720_ts.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c index decb347..56ab739 100644 --- a/drivers/pcmcia/sa1100_shannon.c +++ b/drivers/pcmcia/sa1100_shannon.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include