Merge omap-drivers

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / omap.c

diff --git a/drivers/mmc/omap.c b/drivers/mmc/host/omap.c
similarity index 99%
rename from drivers/mmc/omap.c
rename to drivers/mmc/host/omap.c
index e72a7e8e52202b98d5749fd609767a6894cef56e..54a821ee5510dc54a774bd968fa0d0500135b1d5 100644 (file)
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -22,7 +22,6 @@
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
 #include <linux/mmc/card.h>
 #include <linux/clk.h>