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

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/at91cap9_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91rm9200_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45_devices.c
Simple merge

diff --cc arch/arm/mach-davinci/da850.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx27ads.c
Simple merge

diff --cc arch/arm/mach-mmp/gplugd.c
index 98e25d9,ef738de..32776f3
--- 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-mxs/include/mach/gpio.h
index 56025aa,bb11e63..40a8c17
--- 1/arch/arm/mach-mxs/include/mach/gpio.h
--- 2/arch/arm/mach-mxs/include/mach/gpio.h
+++ b/arch/arm/mach-mxs/include/mach/gpio.h
@@@ -1,31 -1,27 +1,1 @@@
--/*
-- * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.
-- * Copyright 2008 Juergen Beisert, kernel@pengutronix.de
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-- * MA  02110-1301, USA.
-- */
--
--#ifndef __MACH_MXS_GPIO_H__
--#define __MACH_MXS_GPIO_H__
--
- #include <asm-generic/gpio.h>
 -#define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr))
--
- /* use gpiolib dispatchers */
- #define gpio_get_value                __gpio_get_value
- #define gpio_set_value                __gpio_set_value
- #define gpio_cansleep         __gpio_cansleep
- #define gpio_to_irq           __gpio_to_irq
 -#define irq_to_gpio(irq)      ((irq) - MXS_GPIO_IRQ_START)
--
--#endif /* __MACH_MXS_GPIO_H__ */
++/* empty */

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

diff --cc arch/arm/mach-tegra/board-trimslice-pinmux.c
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/gpio.h
index 44af006,3e1ffc8..40a8c17
--- 1/arch/arm/plat-mxc/include/mach/gpio.h
--- 2/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@@ -1,32 -1,33 +1,1 @@@
--/*
-- * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.
-- * Copyright 2008 Juergen Beisert, kernel@pengutronix.de
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-- */
--
--#ifndef __ASM_ARCH_MXC_GPIO_H__
--#define __ASM_ARCH_MXC_GPIO_H__
--
--#include <linux/spinlock.h>
--#include <mach/hardware.h>
- #include <asm-generic/gpio.h>
--
- /* use gpiolib dispatchers */
- #define gpio_get_value                __gpio_get_value
- #define gpio_set_value                __gpio_set_value
- #define gpio_cansleep         __gpio_cansleep
- #define gpio_to_irq           __gpio_to_irq
 -
 -/* There's a off-by-one betweem the gpio bank number and the gpiochip */
 -/* range e.g. GPIO_1_5 is gpio 5 under linux */
 -#define IMX_GPIO_NR(bank, nr)         (((bank) - 1) * 32 + (nr))
 -
 -#define gpio_to_irq(gpio)     (MXC_GPIO_IRQ_START + (gpio))
 -#define irq_to_gpio(irq)      ((irq) - MXC_GPIO_IRQ_START)
--
--#endif
++/* empty */

diff --cc drivers/gpio/gpio-tegra.c
index 75cf911,6b65207..61044c8
--- 1/drivers/gpio/gpio-tegra.c
--- 2/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@@ -330,10 -333,10 +335,11 @@@ static struct irq_chip tegra_gpio_irq_c
   */
  static struct lock_class_key gpio_lock_class;
  
 -static int __init tegra_gpio_init(void)
 +static int __devinit tegra_gpio_probe(struct platform_device *pdev)
  {
 +      struct resource *res;
        struct tegra_gpio_bank *bank;
+       int gpio;
        int i;
        int j;
  

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