From patchwork Wed Aug 10 12:17:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1053282 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 p7ACMq3K021424 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 10 Aug 2011 12:23:14 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qr7mU-0005ua-Vv; Wed, 10 Aug 2011 12:21:07 +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 1Qr7mU-0008O4-74; Wed, 10 Aug 2011 12:21:06 +0000 Received: from eu1sys200aog110.obsmtp.com ([207.126.144.129]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qr7jb-0007U7-9j for linux-arm-kernel@lists.infradead.org; Wed, 10 Aug 2011 12:18:09 +0000 Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob110.postini.com ([207.126.147.11]) with SMTP ID DSNKTkJ2+MBKLYXjr+7mykKKkFe+6Mwkd28a@postini.com; Wed, 10 Aug 2011 12:18:07 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id DAD924D; Wed, 10 Aug 2011 12:17:47 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 7A07F6D; Wed, 10 Aug 2011 12:17:47 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 85E1224C07C; Wed, 10 Aug 2011 14:17:40 +0200 (CEST) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 10 Aug 2011 14:17:47 +0200 From: Linus Walleij To: Grant Likely , , Subject: [PATCH 11/19] mach-ixp2000: rename GPIO header Date: Wed, 10 Aug 2011 14:17:43 +0200 Message-ID: <1312978663-18438-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_081807_673783_11081464 X-CRM114-Status: GOOD ( 13.85 ) 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.129 listed in list.dnswl.org] Cc: Linus Walleij , Lee Jones , Lennert Buytenhek 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:23:14 +0000 (UTC) From: Linus Walleij The ixp2000 abuses the namespace by not implementing any generic GPIO nor gpiolib functions in it - just custom GPIO. Rename the header to for clarity. Cc: Lennert Buytenhek Signed-off-by: Linus Walleij --- arch/arm/mach-ixp2000/core.c | 2 ++ .../include/mach/{gpio.h => gpio-ixp2000.h} | 0 arch/arm/mach-ixp2000/ixdp2x00.c | 1 + drivers/i2c/busses/i2c-ixp2000.c | 2 +- 4 files changed, 4 insertions(+), 1 deletions(-) rename arch/arm/mach-ixp2000/include/mach/{gpio.h => gpio-ixp2000.h} (100%) diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index e95c5e7..59a5126 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c @@ -39,6 +39,8 @@ #include #include +#include + static DEFINE_SPINLOCK(ixp2000_slowport_lock); static unsigned long ixp2000_slowport_irq_flags; diff --git a/arch/arm/mach-ixp2000/include/mach/gpio.h b/arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h similarity index 100% rename from arch/arm/mach-ixp2000/include/mach/gpio.h rename to arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index f615068..634b6c8 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c @@ -41,6 +41,7 @@ #include #include +#include /************************************************************************* * IXDP2x00 IRQ Initialization diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c index be9991b..c01e951 100644 --- a/drivers/i2c/busses/i2c-ixp2000.c +++ b/drivers/i2c/busses/i2c-ixp2000.c @@ -35,7 +35,7 @@ #include #include /* Pick up IXP2000-specific bits */ -#include +#include static inline int ixp2000_scl_pin(void *data) {