From patchwork Wed Aug 10 12:18:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1053422 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7ACTSV1029111 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 10 Aug 2011 12:29:49 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qr7rj-00062K-9E; Wed, 10 Aug 2011 12:26:32 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qr7o2-0000Ln-36; Wed, 10 Aug 2011 12:22:42 +0000 Received: from eu1sys200aog106.obsmtp.com ([207.126.144.121]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qr7kF-0007iN-Ud for linux-arm-kernel@lists.infradead.org; Wed, 10 Aug 2011 12:18:49 +0000 Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob106.postini.com ([207.126.147.11]) with SMTP ID DSNKTkJ3IHGESOOebOTOERq4I65Vew9bRGlf@postini.com; Wed, 10 Aug 2011 12:18:47 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 8BDD1D1; Wed, 10 Aug 2011 12:18:37 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 38F34E13; Wed, 10 Aug 2011 12:18:37 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id CB38424C075; Wed, 10 Aug 2011 14:18:29 +0200 (CEST) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 10 Aug 2011 14:18:36 +0200 From: Linus Walleij To: Grant Likely , , Subject: [PATCH 17/19] mach-pnx4008: rename GPIO header Date: Wed, 10 Aug 2011 14:18:33 +0200 Message-ID: <1312978714-18638-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.3.2 MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110810_081848_250728_3202EFBD X-CRM114-Status: GOOD ( 17.05 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.126.144.121 listed in list.dnswl.org] Cc: Linus Walleij , Lee Jones , Vitaly Wool X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 10 Aug 2011 12:29:49 +0000 (UTC) From: Linus Walleij The PNX4008 header file is using the generic gpio and gpiolib namespace in yet the GPIO interface is not generic at all so rename it to Cc: Vitaly Wool Signed-off-by: Linus Walleij --- .../include/mach/{gpio.h => gpio-pnx4008.h} | 0 arch/arm/mach-pnx4008/serial.c | 2 +- drivers/gpio/gpio-pnx4008.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/mach-pnx4008/include/mach/{gpio.h => gpio-pnx4008.h} (100%) diff --git a/arch/arm/mach-pnx4008/include/mach/gpio.h b/arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h similarity index 100% rename from arch/arm/mach-pnx4008/include/mach/gpio.h rename to arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h diff --git a/arch/arm/mach-pnx4008/serial.c b/arch/arm/mach-pnx4008/serial.c index eb29fac..374c138 100644 --- a/arch/arm/mach-pnx4008/serial.c +++ b/arch/arm/mach-pnx4008/serial.c @@ -9,7 +9,6 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include #include #include #include @@ -20,6 +19,7 @@ #include #include +#include #include #define UART_3 0 diff --git a/drivers/gpio/gpio-pnx4008.c b/drivers/gpio/gpio-pnx4008.c index eef531b..d3e71d3 100644 --- a/drivers/gpio/gpio-pnx4008.c +++ b/drivers/gpio/gpio-pnx4008.c @@ -13,13 +13,13 @@ * is licensed "as is" without any warranty of any kind, whether express * or implied. */ -#include #include #include #include #include #include #include +#include /* register definitions */ #define PIO_VA_BASE IO_ADDRESS(PNX4008_PIO_BASE)