From 83240479df57d1a2832c5bb7f20546911802e26d Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 13 Aug 2012 10:56:43 +0200
Subject: [PATCH] --- yaml --- r: 326414 b: refs/heads/master c:
 651728507140246e9cf4e809f1877cb2eddbc84e h: refs/heads/master v: v3

---
 [refs]                                                          | 2 +-
 trunk/arch/arm/mach-u300/core.c                                 | 2 +-
 trunk/drivers/pinctrl/pinctrl-coh901.c                          | 2 +-
 .../linux/platform_data/pinctrl-coh901.h}                       | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename trunk/{arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h} (100%)

diff --git a/[refs] b/[refs]
index f0149689306f..72549859ff5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04b13de6229621b2bd9eb1b7afaded954c3037de
+refs/heads/master: 651728507140246e9cf4e809f1877cb2eddbc84e
diff --git a/trunk/arch/arm/mach-u300/core.c b/trunk/arch/arm/mach-u300/core.c
index 883d5c26d50b..0158189a4dab 100644
--- a/trunk/arch/arm/mach-u300/core.c
+++ b/trunk/arch/arm/mach-u300/core.c
@@ -31,6 +31,7 @@
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_data/clk-u300.h>
+#include <linux/platform_data/pinctrl-coh901.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -43,7 +44,6 @@
 #include <mach/hardware.h>
 #include <mach/syscon.h>
 #include <mach/dma_channels.h>
-#include <mach/gpio-u300.h>
 
 #include "spi.h"
 #include "i2c.h"
diff --git a/trunk/drivers/pinctrl/pinctrl-coh901.c b/trunk/drivers/pinctrl/pinctrl-coh901.c
index 91a5dc7f6766..b446c9641212 100644
--- a/trunk/drivers/pinctrl/pinctrl-coh901.c
+++ b/trunk/drivers/pinctrl/pinctrl-coh901.c
@@ -21,7 +21,7 @@
 #include <linux/slab.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/pinctrl/pinconf-generic.h>
-#include <mach/gpio-u300.h>
+#include <linux/platform_data/pinctrl-coh901.h>
 #include "pinctrl-coh901.h"
 
 #define U300_GPIO_PORT_STRIDE				(0x30)
diff --git a/trunk/arch/arm/mach-u300/include/mach/gpio-u300.h b/trunk/include/linux/platform_data/pinctrl-coh901.h
similarity index 100%
rename from trunk/arch/arm/mach-u300/include/mach/gpio-u300.h
rename to trunk/include/linux/platform_data/pinctrl-coh901.h