Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1e6b41e authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

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: default avatarVitaly Wool <vitalywool@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 94117cb8

arch/arm/mach-pnx4008/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-pnx4008/include/mach/gpio.h→arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h

+1 −1
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-pnx4008/include/mach/gpio.h

 * arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h

 *

 * PNX4008 GPIO driver - header file

 *

arch/arm/mach-pnx4008/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -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>
@@ -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