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: 3356 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 A909423F46 for ; Wed, 10 Aug 2011 12:18:08 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 78577A182F7 for ; Wed, 10 Aug 2011 12:18:08 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so746446qwb.11 for ; Wed, 10 Aug 2011 05:18:08 -0700 (PDT) Received: by 10.229.159.194 with SMTP id k2mr2928880qcx.83.1312978688243; Wed, 10 Aug 2011 05:18:08 -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 dh7cs78468qcb; Wed, 10 Aug 2011 05:18:08 -0700 (PDT) Received: from mr.google.com ([10.14.119.132]) by 10.14.119.132 with SMTP id n4mr3136723eeh.231.1312978687871 (num_hops = 1); Wed, 10 Aug 2011 05:18:07 -0700 (PDT) Received: by 10.14.119.132 with SMTP id n4mr2312201eeh.231.1312978687268; Wed, 10 Aug 2011 05:18:07 -0700 (PDT) Received: from eu1sys200aog110.obsmtp.com (eu1sys200aog110.obsmtp.com [207.126.144.129]) by mx.google.com with SMTP id i29si594496eei.207.2011.08.10.05.18.00 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 05:18:07 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.129 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.129; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.129 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-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 , , Cc: Lee Jones , Linus Walleij , Lennert Buytenhek 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 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) {