Merge branch 'depends/rmk/gpio' into next/board

Conflicts:
	arch/arm/mach-at91/board-usb-a9260.c
	arch/arm/mach-at91/board-usb-a9263.c
	arch/arm/mach-tegra/board-paz00.h
	arch/arm/mach-tegra/board-seaboard.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/board-usb-a926x.c
index 260260b8199267bda6d155b69d811249596aa627,5bd735787d6d6b15c1a7b8a82ab0427f324b1271..5852d3d9890c8d53d90ae185fdad8945f0044963
--- 1/arch/arm/mach-at91/board-usb-a926x.c
--- 2/arch/arm/mach-at91/board-usb-a9263.c
+++ b/arch/arm/mach-at91/board-usb-a926x.c
@@@ -28,8 -28,7 +28,9 @@@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/gpio_keys.h>
++#include <linux/gpio.h>
  #include <linux/input.h>
 +#include <linux/spi/mmc_spi.h>
  
  #include <asm/setup.h>
  #include <asm/mach-types.h>

diff --cc arch/arm/mach-mmp/gplugd.c
index 98e25d9aaab61ea9c4865d6130fafa0e35d8134b,ef738deb20b5f4ba259cb8c57e7386aa01fb3be8..32776f3739f1d8d2e34cf378eb28cda687d19550
--- 1/arch/arm/mach-mmp/gplugd.c
--- 2/arch/arm/mach-mmp/gplugd.c
+++ b/arch/arm/mach-mmp/gplugd.c
@@@ -13,9 -14,9 +14,8 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
  
- #include <mach/gpio.h>
  #include <mach/pxa168.h>
  #include <mach/mfp-pxa168.h>
 -#include <mach/mfp-gplugd.h>
  
  #include "common.h"
  

diff --cc arch/arm/mach-orion5x/dns323-setup.c
Simple merge

diff --cc arch/arm/mach-tegra/board-paz00.c
index d161590c99c2470377252267c856c6745ad6d9bb,ea2f79c9879bbbbba6c1f868f531d880fae1262d..ac809b6e3defe1f1f96ddf781bd13b4e649b33ae
--- 1/arch/arm/mach-tegra/board-paz00.c
--- 2/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@@ -26,7 -26,6 +26,8 @@@
  #include <linux/pda_power.h>
  #include <linux/io.h>
  #include <linux/i2c.h>
++#include <linux/gpio.h>
 +#include <linux/rfkill-gpio.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
@@@ -36,7 -35,7 +37,6 @@@
  #include <mach/iomap.h>
  #include <mach/irqs.h>
  #include <mach/sdhci.h>
--#include <mach/gpio.h>
  
  #include "board.h"
  #include "board-paz00.h"

diff --cc arch/arm/mach-tegra/board-paz00.h
index 86057c3fb9a0d574c9cfebe4e51c847dc8560b93,42ce8639b90cc38ef5a1c79e053d089ed86dcd0b..8aff06eb58c38e3f0dfdf52d1a8aa02044637317
--- 1/arch/arm/mach-tegra/board-paz00.h
--- 2/arch/arm/mach-tegra/board-paz00.h
+++ b/arch/arm/mach-tegra/board-paz00.h
@@@ -17,19 -17,13 +17,21 @@@
  #ifndef _MACH_TEGRA_BOARD_PAZ00_H
  #define _MACH_TEGRA_BOARD_PAZ00_H
  
- #define TEGRA_GPIO_SD1_CD     TEGRA_GPIO_PV5
- #define TEGRA_GPIO_SD1_WP     TEGRA_GPIO_PH1
- #define TEGRA_GPIO_SD1_POWER  TEGRA_GPIO_PT3
+ #include <mach/gpio-tegra.h>
+ 
 +/* SDCARD */
- #define TEGRA_ULPI_RST                TEGRA_GPIO_PV0
+ #define TEGRA_GPIO_SD1_CD             TEGRA_GPIO_PV5
+ #define TEGRA_GPIO_SD1_WP             TEGRA_GPIO_PH1
+ #define TEGRA_GPIO_SD1_POWER          TEGRA_GPIO_PT3
 +
 +/* ULPI */
+ #define TEGRA_ULPI_RST                        TEGRA_GPIO_PV0
  
- #define TEGRA_WIFI_PWRN               TEGRA_GPIO_PK5
- #define TEGRA_WIFI_RST                TEGRA_GPIO_PD1
- #define TEGRA_WIFI_LED                TEGRA_GPIO_PD0
 +/* WIFI */
++#define TEGRA_WIFI_PWRN                       TEGRA_GPIO_PK5
++#define TEGRA_WIFI_RST                        TEGRA_GPIO_PD1
++#define TEGRA_WIFI_LED                        TEGRA_GPIO_PD0
 +
  void paz00_pinmux_init(void);
  
  #endif

diff --cc arch/arm/mach-tegra/board-seaboard.h
index d06c3342e2c4ed2f2d9003b921d6943450ab93d2,15b6c57361bed412bf43e4de17ced72e4c0a5f60..4c45d4ca3c491a29bef6ece84393845cfcf54a4b
--- 1/arch/arm/mach-tegra/board-seaboard.h
--- 2/arch/arm/mach-tegra/board-seaboard.h
+++ b/arch/arm/mach-tegra/board-seaboard.h
@@@ -17,9 -17,8 +17,11 @@@
  #ifndef _MACH_TEGRA_BOARD_SEABOARD_H
  #define _MACH_TEGRA_BOARD_SEABOARD_H
  
+ #include <mach/gpio-tegra.h>
+ 
 +#define SEABOARD_GPIO_TPS6586X(_x_)   (TEGRA_NR_GPIOS + (_x_))
 +#define SEABOARD_GPIO_WM8903(_x_)     (SEABOARD_GPIO_TPS6586X(4) + (_x_))
 +
  #define TEGRA_GPIO_SD2_CD             TEGRA_GPIO_PI5
  #define TEGRA_GPIO_SD2_WP             TEGRA_GPIO_PH1
  #define TEGRA_GPIO_SD2_POWER          TEGRA_GPIO_PI6

diff --cc arch/arm/mach-tegra/board-trimslice.c
index 91875b975563fb3ec3eb1641d4be8853d6080755,89a6d2adc1dedb61d329f54d5beb10a4d5eadc54..c3aff9fdffd3c3b2182165e66069707b3bfc51f4
--- 1/arch/arm/mach-tegra/board-trimslice.c
--- 2/arch/arm/mach-tegra/board-trimslice.c
+++ b/arch/arm/mach-tegra/board-trimslice.c
@@@ -32,7 -32,7 +32,6 @@@
  
  #include <mach/iomap.h>
  #include <mach/sdhci.h>
--#include <mach/gpio.h>
  
  #include "board.h"
  #include "clock.h"

diff --cc drivers/tty/serial/atmel_serial.c
Simple merge