r1217 - trunk/src/target/kernel/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Fri Mar 2 10:19:42 CET 2007
Author: laforge
Date: 2007-03-02 10:19:41 +0100 (Fri, 02 Mar 2007)
New Revision: 1217
Modified:
trunk/src/target/kernel/patches/s3c_mci.patch
Log:
* re-add missing Makefile hunk to actually build the driver
Modified: trunk/src/target/kernel/patches/s3c_mci.patch
===================================================================
--- trunk/src/target/kernel/patches/s3c_mci.patch 2007-03-02 03:53:45 UTC (rev 1216)
+++ trunk/src/target/kernel/patches/s3c_mci.patch 2007-03-02 09:19:41 UTC (rev 1217)
@@ -1,9 +1,9 @@
This is the latest S3C MMC/SD driver by Thomas Kleffel
-Index: linux-2.6.20/drivers/mmc/Kconfig
+Index: linux-2.6.20.1/drivers/mmc/Kconfig
===================================================================
---- linux-2.6.20.orig/drivers/mmc/Kconfig 2007-02-15 16:15:19.000000000 +0100
-+++ linux-2.6.20/drivers/mmc/Kconfig 2007-02-15 16:17:32.000000000 +0100
+--- linux-2.6.20.1.orig/drivers/mmc/Kconfig 2007-02-26 00:46:48.000000000 +0100
++++ linux-2.6.20.1/drivers/mmc/Kconfig 2007-02-26 00:46:55.000000000 +0100
@@ -125,4 +125,16 @@
To compile this driver as a module, choose M here: the
module will be called tifm_sd.
@@ -21,10 +21,10 @@
+
+
endmenu
-Index: linux-2.6.20/drivers/mmc/mmc_debug.c
+Index: linux-2.6.20.1/drivers/mmc/mmc_debug.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/drivers/mmc/mmc_debug.c 2007-02-15 16:17:32.000000000 +0100
++++ linux-2.6.20.1/drivers/mmc/mmc_debug.c 2007-02-26 00:46:55.000000000 +0100
@@ -0,0 +1,59 @@
+/*
+ * linux/drivers/mmc/mmc_debug.c
@@ -85,10 +85,10 @@
+ }
+}
+EXPORT_SYMBOL(mmc_err2str);
-Index: linux-2.6.20/drivers/mmc/mmc_debug.h
+Index: linux-2.6.20.1/drivers/mmc/mmc_debug.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/drivers/mmc/mmc_debug.h 2007-02-15 16:17:32.000000000 +0100
++++ linux-2.6.20.1/drivers/mmc/mmc_debug.h 2007-02-26 00:46:55.000000000 +0100
@@ -0,0 +1,7 @@
+#ifndef MMC_DEBUG_H
+#define MMC_DEBUG_H
@@ -97,10 +97,10 @@
+char *mmc_err2str(int err);
+
+#endif /* MMC_DEBUG_H */
-Index: linux-2.6.20/drivers/mmc/s3cmci.c
+Index: linux-2.6.20.1/drivers/mmc/s3cmci.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/drivers/mmc/s3cmci.c 2007-02-15 16:22:54.000000000 +0100
++++ linux-2.6.20.1/drivers/mmc/s3cmci.c 2007-03-02 10:17:00.000000000 +0100
@@ -0,0 +1,1339 @@
+/*
+ * linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
@@ -1441,10 +1441,10 @@
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Thomas Kleffel <tk at maintech.de>");
+
-Index: linux-2.6.20/drivers/mmc/s3cmci.h
+Index: linux-2.6.20.1/drivers/mmc/s3cmci.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/drivers/mmc/s3cmci.h 2007-02-15 16:22:43.000000000 +0100
++++ linux-2.6.20.1/drivers/mmc/s3cmci.h 2007-03-02 10:17:00.000000000 +0100
@@ -0,0 +1,71 @@
+/*
+ * linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
@@ -1517,10 +1517,10 @@
+ unsigned int ccnt, dcnt;
+ struct tasklet_struct pio_tasklet;
+};
-Index: linux-2.6.20/include/asm-arm/arch-s3c2410/regs-sdi.h
+Index: linux-2.6.20.1/include/asm-arm/arch-s3c2410/regs-sdi.h
===================================================================
---- linux-2.6.20.orig/include/asm-arm/arch-s3c2410/regs-sdi.h 2007-02-15 16:15:19.000000000 +0100
-+++ linux-2.6.20/include/asm-arm/arch-s3c2410/regs-sdi.h 2007-02-15 16:17:32.000000000 +0100
+--- linux-2.6.20.1.orig/include/asm-arm/arch-s3c2410/regs-sdi.h 2007-02-26 00:46:48.000000000 +0100
++++ linux-2.6.20.1/include/asm-arm/arch-s3c2410/regs-sdi.h 2007-02-26 00:46:55.000000000 +0100
@@ -28,9 +28,15 @@
#define S3C2410_SDIDCNT (0x30)
#define S3C2410_SDIDSTA (0x34)
@@ -1588,10 +1588,10 @@
#define S3C2410_SDIFSTA_RFLAST (1<<9)
#define S3C2410_SDIFSTA_RFFULL (1<<8)
#define S3C2410_SDIFSTA_RFHALF (1<<7)
-Index: linux-2.6.20/include/linux/mmc/mmc.h
+Index: linux-2.6.20.1/include/linux/mmc/mmc.h
===================================================================
---- linux-2.6.20.orig/include/linux/mmc/mmc.h 2007-02-15 16:15:19.000000000 +0100
-+++ linux-2.6.20/include/linux/mmc/mmc.h 2007-02-15 16:17:32.000000000 +0100
+--- linux-2.6.20.1.orig/include/linux/mmc/mmc.h 2007-02-26 00:46:48.000000000 +0100
++++ linux-2.6.20.1/include/linux/mmc/mmc.h 2007-02-26 00:46:55.000000000 +0100
@@ -54,12 +54,15 @@
unsigned int retries; /* max number of retries */
unsigned int error; /* command error */
@@ -1614,3 +1614,20 @@
struct mmc_data *data; /* data segment associated with cmd */
struct mmc_request *mrq; /* associated request */
+Index: linux-2.6.20.1/drivers/mmc/Makefile
+===================================================================
+--- linux-2.6.20.1.orig/drivers/mmc/Makefile 2007-03-02 10:18:32.000000000 +0100
++++ linux-2.6.20.1/drivers/mmc/Makefile 2007-03-02 10:18:14.000000000 +0100
+@@ -24,10 +24,12 @@
+ obj-$(CONFIG_MMC_OMAP) += omap.o
+ obj-$(CONFIG_MMC_AT91) += at91_mci.o
+ obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o
++obj-$(CONFIG_MMC_S3C) += s3cmci.o
+
+ mmc_core-y := mmc.o mmc_sysfs.o
+ mmc_core-$(CONFIG_BLOCK) += mmc_queue.o
+
+ ifeq ($(CONFIG_MMC_DEBUG),y)
++obj-$(CONFIG_MMC) += mmc_debug.o
+ EXTRA_CFLAGS += -DDEBUG
+ endif
More information about the commitlog
mailing list
