2010-03-31 11:12:33 +00:00
|
|
|
--- a/src/Makefile.am
|
|
|
|
+++ b/src/Makefile.am
|
|
|
|
@@ -227,7 +227,7 @@ drv_vmmc_CFLAGS += -fno-common
|
|
|
|
drv_vmmc_OBJS = "$(subst .c,.o, $(drv_vmmc_SOURCES) $(nodist_drv_vmmc_SOURCES))"
|
|
|
|
|
|
|
|
drv_vmmc.ko: $(drv_vmmc_SOURCES) $(EXTRA_DIST)
|
|
|
|
- @echo -e "Making Linux 2.6.x kernel object"
|
|
|
|
+ @echo "Making Linux 2.6.x kernel object"
|
|
|
|
@for f in $(drv_vmmc_SOURCES) $(nodist_drv_vmmc_SOURCES) ; do \
|
|
|
|
if test ! -e $(PWD)/$$f; then \
|
|
|
|
echo " LN $$f" ; \
|
|
|
|
@@ -235,10 +235,10 @@ drv_vmmc.ko: $(drv_vmmc_SOURCES) $(EXTRA
|
|
|
|
ln -s @abs_srcdir@/$$f $(PWD)/$$f; \
|
|
|
|
fi; \
|
|
|
|
done;
|
|
|
|
- @echo -e "# drv_vmmc: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
|
|
|
|
- @echo -e "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild
|
|
|
|
- @echo -e "$(subst .ko,,$@)-y := $(drv_vmmc_OBJS)" >> $(PWD)/Kbuild
|
|
|
|
- @echo -e "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(CFLAGS) $(drv_vmmc_CFLAGS) $(INCLUDES)" >> $(PWD)/Kbuild
|
|
|
|
+ @echo "# drv_vmmc: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
|
|
|
|
+ @echo "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild
|
|
|
|
+ @echo "$(subst .ko,,$@)-y := $(drv_vmmc_OBJS)" >> $(PWD)/Kbuild
|
|
|
|
+ @echo "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(CFLAGS) $(drv_vmmc_CFLAGS) $(INCLUDES)" >> $(PWD)/Kbuild
|
|
|
|
$(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules
|
|
|
|
|
|
|
|
clean-generic:
|
2010-04-27 15:37:13 +00:00
|
|
|
--- a/src/drv_vmmc_linux.c
|
|
|
|
+++ b/src/drv_vmmc_linux.c
|
|
|
|
@@ -27,6 +27,7 @@
|
|
|
|
#include <linux/proc_fs.h>
|
|
|
|
#include <linux/wait.h>
|
|
|
|
#include <linux/vmalloc.h>
|
|
|
|
+#include <linux/sched.h>
|
|
|
|
|
|
|
|
#ifdef LINUX_2_6
|
|
|
|
#include <linux/version.h>
|