Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / mmc / core / sd_ops.c

diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c
index a6dafe62b992416f00c776f61312c1c9a00b61df..0d96080d44b098431af53b15764c0f8e6fdd1e81 100644 (file)
--- a/drivers/mmc/core/sd_ops.c
+++ b/drivers/mmc/core/sd_ops.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/types.h>
-#include <asm/scatterlist.h>
 #include <linux/scatterlist.h>
 
 #include <linux/mmc/host.h>