From patchwork Tue Aug 23 08:05:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 3614 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 52A8823E54 for ; Tue, 23 Aug 2011 08:05:23 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 39899A1801F for ; Tue, 23 Aug 2011 08:05:23 +0000 (UTC) Received: by bkbzs2 with SMTP id zs2so6692114bkb.11 for ; Tue, 23 Aug 2011 01:05:23 -0700 (PDT) Received: by 10.204.133.17 with SMTP id d17mr1432672bkt.122.1314086722790; Tue, 23 Aug 2011 01:05:22 -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.204.41.75 with SMTP id n11cs202143bke; Tue, 23 Aug 2011 01:05:22 -0700 (PDT) Received: by 10.213.5.4 with SMTP id 4mr124402ebt.80.1314086721440; Tue, 23 Aug 2011 01:05:21 -0700 (PDT) Received: from eu1sys200aog120.obsmtp.com (eu1sys200aog120.obsmtp.com [207.126.144.149]) by mx.google.com with SMTP id e57si4851074eeb.150.2011.08.23.01.05.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 01:05:21 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.149 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.149; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.149 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 eu1sys200aob120.postini.com ([207.126.147.11]) with SMTP ID DSNKTlNfOavj1XFjT1Jlk5oVxoI/xxW1LAr+@postini.com; Tue, 23 Aug 2011 08:05:21 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 9EAA0DB; Tue, 23 Aug 2011 08:05:10 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 54D82EB0; Tue, 23 Aug 2011 08:05:10 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 04221A8065; Tue, 23 Aug 2011 10:05:06 +0200 (CEST) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 23 Aug 2011 10:05:09 +0200 From: Linus Walleij To: Cc: Lee Jones , Linus Walleij , Vitaly Wool Subject: [PATCH] mach-pnx4008: rename GPIO header Date: Tue, 23 Aug 2011 10:05:06 +0200 Message-ID: <1314086706-28705-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 This fixes a build failure in current -next: the includes were changed from to but since this platform isn't using generic gpio did not include and things broke apart. Cc: Vitaly Wool Signed-off-by: Linus Walleij --- arch/arm/mach-pnx4008/gpio.c | 2 +- .../include/mach/{gpio.h => gpio-pnx4008.h} | 2 +- arch/arm/mach-pnx4008/serial.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename arch/arm/mach-pnx4008/include/mach/{gpio.h => gpio-pnx4008.h} (99%) diff --git a/arch/arm/mach-pnx4008/gpio.c b/arch/arm/mach-pnx4008/gpio.c index eef531b..d3e71d3 100644 --- a/arch/arm/mach-pnx4008/gpio.c +++ b/arch/arm/mach-pnx4008/gpio.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) diff --git a/arch/arm/mach-pnx4008/include/mach/gpio.h b/arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h similarity index 99% rename from arch/arm/mach-pnx4008/include/mach/gpio.h rename to arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h index 9591467..41027dd 100644 --- a/arch/arm/mach-pnx4008/include/mach/gpio.h +++ b/arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h @@ -1,5 +1,5 @@ /* - * arch/arm/mach-pnx4008/include/mach/gpio.h + * arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h * * PNX4008 GPIO driver - header file * 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