From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 13 Oct 2011 06:11:23 +0000 (+1100)
Subject: Merge remote-tracking branch 'pinctrl/for-next'
X-Git-Tag: next-20111013~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1bdead39c01e900f0ef751af81032d660335996a;p=karo-tx-linux.git

Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
	arch/arm/mach-u300/Kconfig
	arch/arm/mach-u300/core.c
---

1bdead39c01e900f0ef751af81032d660335996a
diff --cc arch/arm/mach-u300/Kconfig
index 39e077e2f243,449fd6a8dbd6..34bb3f9b46bf
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@@ -6,7 -6,8 +6,9 @@@ comment "ST-Ericsson Mobile Platform Pr
  
  config MACH_U300
  	bool "U300"
 +	select GPIO_U300
+ 	select PINCTRL
+ 	select PINMUX_U300
  
  comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"
  
diff --cc arch/arm/mach-u300/core.c
index 2f1d758133a7,2f5929bdeaa2..b73a451bbc9f
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@@ -25,7 -25,8 +25,9 @@@
  #include <linux/err.h>
  #include <linux/mtd/nand.h>
  #include <linux/mtd/fsmc.h>
 +#include <linux/dma-mapping.h>
+ #include <linux/pinctrl/machine.h>
+ #include <linux/pinctrl/pinmux.h>
  
  #include <asm/types.h>
  #include <asm/setup.h>
@@@ -1600,6 -1719,8 +1676,7 @@@ static struct platform_device *platform
  	&gpio_device,
  	&nand_device,
  	&wdog_device,
 -	&ave_device,
+ 	&pinmux_device,
  };
  
  /*
diff --cc arch/arm/mach-u300/mmc.c
index d9a5c92db74a,d5e4a98a9ab8..4d482aacc272
--- a/arch/arm/mach-u300/mmc.c
+++ b/arch/arm/mach-u300/mmc.c
@@@ -18,10 -19,8 +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 = {
  	/*