From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Oct 2011 06:39:10 +0000 (+0200)
Subject: Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux... 
X-Git-Tag: v3.2-rc1~148
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ca90666287401b475d9e0becf85bd02f069f1de8

Merge branch 'gpio' of ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
  ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
  ARM: 7104/1: plat-pxa: break out GPIO driver specifics
  ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
  ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
  ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
  ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
  ARM: 7083/1: rewrite U300 GPIO to use gpiolib
  ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
  ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
  ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
  ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
  ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
  ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
  ARM: 7057/1: mach-pnx4008: rename GPIO header
  ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
  ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
  ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
  ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
  ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
  ARM: 7043/1: mach-ixp2000: rename GPIO header
  ...

Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
---

ca90666287401b475d9e0becf85bd02f069f1de8
diff --cc arch/arm/mach-mmp/gplugd.c
index 98e25d9aaab6,ef738deb20b5..32776f3739f1
--- a/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-pxa/irq.c
index ca6075717824,d493a230addf..8d9200f92268
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@@ -19,11 -18,9 +18,11 @@@
  #include <linux/io.h>
  #include <linux/irq.h>
  
 +#include <asm/exception.h>
 +
  #include <mach/hardware.h>
  #include <mach/irqs.h>
- #include <mach/gpio.h>
+ #include <mach/gpio-pxa.h>
  
  #include "generic.h"
  
diff --cc arch/arm/mach-u300/Kconfig
index 449fd6a8dbd6,7b5c229dc7ea..d6e5d306557b
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@@ -6,8 -6,7 +6,9 @@@ comment "ST-Ericsson Mobile Platform Pr
  
  config MACH_U300
  	bool "U300"
 +	select PINCTRL
 +	select PINMUX_U300
+ 	select GPIO_U300
  
  comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"
  
diff --cc arch/arm/mach-u300/mmc.c
index d5e4a98a9ab8,d9a5c92db74a..4d482aacc272
--- a/arch/arm/mach-u300/mmc.c
+++ b/arch/arm/mach-u300/mmc.c
@@@ -19,8 -18,10 +18,9 @@@
  #include <linux/slab.h>
  #include <mach/coh901318.h>
  #include <mach/dma_channels.h>
+ #include <mach/gpio-u300.h>
  
  #include "mmc.h"
 -#include "padmux.h"
  
  static struct mmci_platform_data mmc0_plat_data = {
  	/*