Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git] / drivers / mmc / host / pxamci.c
similarity index 99%
rename from drivers/mmc/pxamci.c
rename to drivers/mmc/host/pxamci.c
index fca894e55f4a228fd6a951da4b4c13d689da1bf9..d97d3864b57fc5d553dd7f51e487d4b5a5e75a2c 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
 
 #include <asm/dma.h>
 #include <asm/io.h>