---

yaml --- r: 53580 b: refs/heads/master c: da7fbe5 h: refs/heads/master v: v3
git-mirror · May 1, 2007 · 8bfe913 · 8bfe913
1 parent 6fd6efb
commit 8bfe913
Show file tree

Hide file tree

Showing 14 changed files with 845 additions and 518 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaac1b470bd0dccb30912356617069dc6199cc80
+refs/heads/master: da7fbe58d2d347e95af699ddf04d885be6362bbe
diff --git a/trunk/drivers/mmc/card/block.c b/trunk/drivers/mmc/card/block.c
@@ -32,8 +32,8 @@
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
-#include <linux/mmc/host.h>
+#include <linux/mmc/mmc.h>
+#include <linux/mmc/sd.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>

diff --git a/trunk/drivers/mmc/core/Makefile b/trunk/drivers/mmc/core/Makefile
@@ -7,5 +7,5 @@ ifeq ($(CONFIG_MMC_DEBUG),y)
 endif
 
 obj-$(CONFIG_MMC)		+= mmc_core.o
-mmc_core-y			:= core.o sysfs.o
+mmc_core-y			:= core.o sysfs.o mmc_ops.o sd_ops.o