From cf9fa1a6fd86700d3da7b57742aeacf6c85b8cc3 Mon Sep 17 00:00:00 2001
From: Zhangfei Gao <zhangfei.gao@marvell.com>
Date: Mon, 20 Jun 2011 22:11:52 +0800
Subject: [PATCH] --- yaml --- r: 255179 b: refs/heads/master c:
 bfed345edfe05b291f7e5d396d4b447b6e8e66fa h: refs/heads/master i:   255177:
 b95f60346af6ce64c126b6b8a185d0838881360d   255175:
 8955617fdb8599dc967725264117930cc77d0929 v: v3

---
 [refs]                                                 |  2 +-
 trunk/arch/arm/mach-mmp/include/mach/mmp2.h            |  2 +-
 trunk/drivers/mmc/host/sdhci-pxav2.c                   |  2 +-
 trunk/drivers/mmc/host/sdhci-pxav3.c                   |  2 +-
 .../linux/platform_data/pxa_sdhci.h}                   | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename trunk/{arch/arm/plat-pxa/include/plat/sdhci.h => include/linux/platform_data/pxa_sdhci.h} (92%)

diff --git a/[refs] b/[refs]
index 7b0066f6f3b6..1cb7bdfa2ad5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c984c2638501e9bdb23438e61b922e3234959fac
+refs/heads/master: bfed345edfe05b291f7e5d396d4b447b6e8e66fa
diff --git a/trunk/arch/arm/mach-mmp/include/mach/mmp2.h b/trunk/arch/arm/mach-mmp/include/mach/mmp2.h
index 2cbf6df09b82..de7b88826ad7 100644
--- a/trunk/arch/arm/mach-mmp/include/mach/mmp2.h
+++ b/trunk/arch/arm/mach-mmp/include/mach/mmp2.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_MACH_MMP2_H
 #define __ASM_MACH_MMP2_H
 
-#include <plat/sdhci.h>
+#include <linux/platform_data/pxa_sdhci.h>
 
 struct sys_timer;
 
diff --git a/trunk/drivers/mmc/host/sdhci-pxav2.c b/trunk/drivers/mmc/host/sdhci-pxav2.c
index 7a6fa8c08363..38f58994f79a 100644
--- a/trunk/drivers/mmc/host/sdhci-pxav2.c
+++ b/trunk/drivers/mmc/host/sdhci-pxav2.c
@@ -25,7 +25,7 @@
 #include <linux/gpio.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
-#include <plat/sdhci.h>
+#include <linux/platform_data/pxa_sdhci.h>
 #include <linux/slab.h>
 #include "sdhci.h"
 #include "sdhci-pltfm.h"
diff --git a/trunk/drivers/mmc/host/sdhci-pxav3.c b/trunk/drivers/mmc/host/sdhci-pxav3.c
index 901f00fb252b..4198dbbc5c20 100644
--- a/trunk/drivers/mmc/host/sdhci-pxav3.c
+++ b/trunk/drivers/mmc/host/sdhci-pxav3.c
@@ -24,7 +24,7 @@
 #include <linux/gpio.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
-#include <plat/sdhci.h>
+#include <linux/platform_data/pxa_sdhci.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include "sdhci.h"
diff --git a/trunk/arch/arm/plat-pxa/include/plat/sdhci.h b/trunk/include/linux/platform_data/pxa_sdhci.h
similarity index 92%
rename from trunk/arch/arm/plat-pxa/include/plat/sdhci.h
rename to trunk/include/linux/platform_data/pxa_sdhci.h
index 800ebc149fc1..51ad0995abac 100644
--- a/trunk/arch/arm/plat-pxa/include/plat/sdhci.h
+++ b/trunk/include/linux/platform_data/pxa_sdhci.h
@@ -1,4 +1,5 @@
-/* linux/arch/arm/plat-pxa/include/plat/sdhci.h
+/*
+ * include/linux/platform_data/pxa_sdhci.h
  *
  * Copyright 2010 Marvell
  *	Zhangfei Gao <zhangfei.gao@marvell.com>
@@ -10,8 +11,8 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef __PLAT_PXA_SDHCI_H
-#define __PLAT_PXA_SDHCI_H
+#ifndef _PXA_SDHCI_H_
+#define _PXA_SDHCI_H_
 
 /* pxa specific flag */
 /* Require clock free running */
@@ -56,5 +57,4 @@ struct sdhci_pxa {
 	u8	clk_enable;
 	u8	power_mode;
 };
-
-#endif /* __PLAT_PXA_SDHCI_H */
+#endif /* _PXA_SDHCI_H_ */