提交 a1e6b41e 编写于 作者: L Linus Walleij 提交者: Russell King

ARM: 7057/1: mach-pnx4008: rename GPIO header

The PNX4008 header file is using the generic gpio and gpiolib
namespace in <mach/gpio.h> yet the GPIO interface is not generic
at all so rename it to <mach/gpio-pnx4008.h>

This fixes a build failure in current -next: the includes were
changed from <mach/gpio.h> to <linux/gpio.h> but since this
platform isn't using generic gpio <linux/gpio.h> did not include
<mach/gpio.h> and things broke apart.
Acked-by: NVitaly Wool <vitalywool@gmail.com>
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 94117cb8
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
* is licensed "as is" without any warranty of any kind, whether express * is licensed "as is" without any warranty of any kind, whether express
* or implied. * or implied.
*/ */
#include <linux/gpio.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/platform.h> #include <mach/platform.h>
#include <mach/gpio-pnx4008.h>
/* register definitions */ /* register definitions */
#define PIO_VA_BASE IO_ADDRESS(PNX4008_PIO_BASE) #define PIO_VA_BASE IO_ADDRESS(PNX4008_PIO_BASE)
......
/* /*
* arch/arm/mach-pnx4008/include/mach/gpio.h * arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
* *
* PNX4008 GPIO driver - header file * PNX4008 GPIO driver - header file
* *
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/gpio.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/io.h> #include <linux/io.h>
...@@ -20,6 +19,7 @@ ...@@ -20,6 +19,7 @@
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <mach/gpio-pnx4008.h>
#include <mach/clock.h> #include <mach/clock.h>
#define UART_3 0 #define UART_3 0
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册