diff --git a/[refs] b/[refs]
index f59a855eb97a..f2996207eb3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b711cb13843f5082e82970dd1e8031383134a65
+refs/heads/master: d3b993dcc11cd291e6908ed02b9db99970220952
diff --git a/trunk/drivers/mmc/host/sdhci-cns3xxx.c b/trunk/drivers/mmc/host/sdhci-cns3xxx.c
index b7050b380d5f..9ebd1d7759dc 100644
--- a/trunk/drivers/mmc/host/sdhci-cns3xxx.c
+++ b/trunk/drivers/mmc/host/sdhci-cns3xxx.c
@@ -15,7 +15,7 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/mmc/host.h>
-#include <linux/sdhci-pltfm.h>
+#include <linux/mmc/sdhci-pltfm.h>
 #include <mach/cns3xxx.h>
 #include "sdhci.h"
 #include "sdhci-pltfm.h"
diff --git a/trunk/drivers/mmc/host/sdhci-pltfm.c b/trunk/drivers/mmc/host/sdhci-pltfm.c
index 730fdf54ecb0..685202be2778 100644
--- a/trunk/drivers/mmc/host/sdhci-pltfm.c
+++ b/trunk/drivers/mmc/host/sdhci-pltfm.c
@@ -30,7 +30,7 @@
 #include <linux/mmc/host.h>
 
 #include <linux/io.h>
-#include <linux/sdhci-pltfm.h>
+#include <linux/mmc/sdhci-pltfm.h>
 
 #include "sdhci.h"
 #include "sdhci-pltfm.h"
diff --git a/trunk/drivers/mmc/host/sdhci-pltfm.h b/trunk/drivers/mmc/host/sdhci-pltfm.h
index 93a031973f62..562b92957f18 100644
--- a/trunk/drivers/mmc/host/sdhci-pltfm.h
+++ b/trunk/drivers/mmc/host/sdhci-pltfm.h
@@ -13,7 +13,7 @@
 
 #include <linux/clk.h>
 #include <linux/types.h>
-#include <linux/sdhci-pltfm.h>
+#include <linux/mmc/sdhci-pltfm.h>
 
 struct sdhci_pltfm_host {
 	struct clk *clk;
diff --git a/trunk/include/linux/sdhci-pltfm.h b/trunk/include/linux/mmc/sdhci-pltfm.h
similarity index 100%
rename from trunk/include/linux/sdhci-pltfm.h
rename to trunk/include/linux/mmc/sdhci-pltfm.h