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: 3362 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9011723F46 for ; Wed, 10 Aug 2011 12:18:49 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id 5EFCCA18396 for ; Wed, 10 Aug 2011 12:18:49 +0000 (UTC) Received: by mail-qy0-f173.google.com with SMTP id 31so3214813qyk.11 for ; Wed, 10 Aug 2011 05:18:49 -0700 (PDT) Received: by 10.229.42.10 with SMTP id q10mr3454101qce.45.1312978728844; Wed, 10 Aug 2011 05:18:48 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.190.71 with SMTP id dh7cs78523qcb; Wed, 10 Aug 2011 05:18:48 -0700 (PDT) Received: from mr.google.com ([10.213.31.82]) by 10.213.31.82 with SMTP id x18mr1280160ebc.54.1312978728460 (num_hops = 1); Wed, 10 Aug 2011 05:18:48 -0700 (PDT) Received: by 10.213.31.82 with SMTP id x18mr877758ebc.54.1312978727913; Wed, 10 Aug 2011 05:18:47 -0700 (PDT) Received: from eu1sys200aog106.obsmtp.com (eu1sys200aog106.obsmtp.com [207.126.144.121]) by mx.google.com with SMTP id p16si622543eef.5.2011.08.10.05.18.41 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 05:18:47 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.121 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.121; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.121 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com 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 , , Cc: Lee Jones , Linus Walleij , Vitaly Wool 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 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)