Skip to content

Commit

Permalink
ARM: 7057/1: mach-pnx4008: rename GPIO header
Browse files Browse the repository at this point in the history
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: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Linus Walleij authored and Russell King committed Aug 23, 2011
1 parent 94117cb commit a1e6b41
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-pnx4008/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
*/
#include <linux/gpio.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <mach/gpio-pnx4008.h>

/* register definitions */
#define PIO_VA_BASE IO_ADDRESS(PNX4008_PIO_BASE)
Expand Down
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pnx4008/serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/io.h>
Expand All @@ -20,6 +19,7 @@
#include <linux/serial_core.h>
#include <linux/serial_reg.h>

#include <mach/gpio-pnx4008.h>
#include <mach/clock.h>

#define UART_3 0
Expand Down

0 comments on commit a1e6b41

Please sign in to comment.