--- Begin Message ---
Author: nbd
Date: 2007-10-01 21:14:46 +0200 (Mon, 01 Oct 2007)
New Revision: 3067
Added:
developers/nbd/patches/130-gta02v2.patch
Modified:
developers/nbd/patches/100-sdio_merge.patch
Log:
fix sdio merge patch, add gta02 fix
Modified: developers/nbd/patches/100-sdio_merge.patch
===================================================================
--- developers/nbd/patches/100-sdio_merge.patch 2007-10-01 16:12:59 UTC (rev
3066)
+++ developers/nbd/patches/100-sdio_merge.patch 2007-10-01 19:14:46 UTC (rev
3067)
@@ -1,7 +1,7 @@
-Index: drivers/mmc/card/block.c
+Index: linux-2.6.22.4/drivers/mmc/card/block.c
===================================================================
---- drivers/mmc/card/block.c.orig 2007-09-11 02:47:57.620494102 +0200
-+++ drivers/mmc/card/block.c 2007-09-11 02:48:16.985597655 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/card/block.c 2007-09-22
22:42:48.044113776 +0200
++++ linux-2.6.22.4/drivers/mmc/card/block.c 2007-09-22 22:43:13.049538753
+0200
@@ -154,7 +154,7 @@
cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
@@ -56,10 +56,10 @@
/*
* Set the read-only status based on the supported commands
-Index: drivers/mmc/card/Kconfig
+Index: linux-2.6.22.4/drivers/mmc/card/Kconfig
===================================================================
---- drivers/mmc/card/Kconfig.orig 2007-09-11 02:47:57.624494329 +0200
-+++ drivers/mmc/card/Kconfig 2007-09-11 02:48:16.989597879 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/card/Kconfig 2007-09-22
22:42:48.048114002 +0200
++++ linux-2.6.22.4/drivers/mmc/card/Kconfig 2007-09-22 22:43:13.065539666
+0200
@@ -14,3 +14,28 @@
mount the filesystem. Almost everyone wishing MMC support
should say Y or M here.
@@ -89,20 +89,20 @@
+ SDIO function driver for SDIO cards that implements the UART
+ class, as well as the GPS class which appears like a UART.
+
-Index: drivers/mmc/card/Makefile
+Index: linux-2.6.22.4/drivers/mmc/card/Makefile
===================================================================
---- drivers/mmc/card/Makefile.orig 2007-09-11 02:47:57.632494783 +0200
-+++ drivers/mmc/card/Makefile 2007-09-11 02:48:17.153607227 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/card/Makefile 2007-09-22
22:42:48.056114460 +0200
++++ linux-2.6.22.4/drivers/mmc/card/Makefile 2007-09-22 22:43:13.101541716
+0200
@@ -9,3 +9,5 @@
obj-$(CONFIG_MMC_BLOCK) += mmc_block.o
mmc_block-objs := block.o queue.o
+obj-$(CONFIG_SDIO_UART) += sdio_uart.o
+
-Index: drivers/mmc/card/queue.c
+Index: linux-2.6.22.4/drivers/mmc/card/queue.c
===================================================================
---- drivers/mmc/card/queue.c.orig 2007-09-11 02:47:57.640495242 +0200
-+++ drivers/mmc/card/queue.c 2007-09-11 02:48:17.177608595 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/card/queue.c 2007-09-22
22:42:48.064114916 +0200
++++ linux-2.6.22.4/drivers/mmc/card/queue.c 2007-09-22 22:43:13.121542856
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/queue.c
@@ -404,10 +404,10 @@
+ copy_sg(mq->bounce_sg, mq->bounce_sg_len, mq->sg, 1);
+}
+
-Index: drivers/mmc/card/queue.h
+Index: linux-2.6.22.4/drivers/mmc/card/queue.h
===================================================================
---- drivers/mmc/card/queue.h.orig 2007-09-11 02:47:57.648495694 +0200
-+++ drivers/mmc/card/queue.h 2007-09-11 02:48:17.205610195 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/card/queue.h 2007-09-22
22:42:48.068115142 +0200
++++ linux-2.6.22.4/drivers/mmc/card/queue.h 2007-09-22 22:43:13.149544451
+0200
@@ -14,6 +14,9 @@
void *data;
struct request_queue *queue;
@@ -427,10 +427,10 @@
+extern void mmc_queue_bounce_post(struct mmc_queue *);
+
#endif
-Index: drivers/mmc/card/sdio_uart.c
+Index: linux-2.6.22.4/drivers/mmc/card/sdio_uart.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/card/sdio_uart.c 2007-09-11 02:48:17.225611335 +0200
++++ linux-2.6.22.4/drivers/mmc/card/sdio_uart.c 2007-09-22
22:43:13.173545821 +0200
@@ -0,0 +1,1158 @@
+/*
+ * linux/drivers/mmc/card/sdio_uart.c - SDIO UART/GPS driver
@@ -1590,10 +1590,10 @@
+
+MODULE_AUTHOR("Nicolas Pitre");
+MODULE_LICENSE("GPL");
-Index: drivers/mmc/core/bus.c
+Index: linux-2.6.22.4/drivers/mmc/core/bus.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/bus.c 2007-09-11 02:48:17.249612701 +0200
++++ linux-2.6.22.4/drivers/mmc/core/bus.c 2007-09-22 22:43:13.197547186
+0200
@@ -0,0 +1,288 @@
+/*
+ * linux/drivers/mmc/core/bus.c
@@ -1883,10 +1883,10 @@
+ put_device(&card->dev);
+}
+
-Index: drivers/mmc/core/bus.h
+Index: linux-2.6.22.4/drivers/mmc/core/bus.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/bus.h 2007-09-11 02:48:17.273614065 +0200
++++ linux-2.6.22.4/drivers/mmc/core/bus.h 2007-09-22 22:43:13.225548785
+0200
@@ -0,0 +1,22 @@
+/*
+ * linux/drivers/mmc/core/bus.h
@@ -1910,10 +1910,10 @@
+
+#endif
+
-Index: drivers/mmc/core/core.c
+Index: linux-2.6.22.4/drivers/mmc/core/core.c
===================================================================
---- drivers/mmc/core/core.c.orig 2007-09-11 02:47:57.672497063 +0200
-+++ drivers/mmc/core/core.c 2007-09-11 02:48:17.293615205 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/core/core.c 2007-09-22
22:42:48.092116511 +0200
++++ linux-2.6.22.4/drivers/mmc/core/core.c 2007-09-22 22:43:13.249550150
+0200
@@ -27,13 +27,36 @@
#include <linux/mmc/sd.h>
@@ -2500,67 +2500,71 @@
+module_exit(mmc_exit);
+
MODULE_LICENSE("GPL");
-Index: drivers/mmc/core/core.h
+Index: linux-2.6.22.4/drivers/mmc/core/core.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/core.h 2007-09-11 02:48:17.321616803 +0200
-@@ -0,0 +1,52 @@
-+/*
-+ * linux/drivers/mmc/core/core.h
-+ *
-+ * Copyright (C) 2003 Russell King, All Rights Reserved.
-+ * Copyright 2007 Pierre Ossman
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#ifndef _MMC_CORE_CORE_H
-+#define _MMC_CORE_CORE_H
-+
-+#include <linux/delay.h>
-+
-+#define MMC_CMD_RETRIES 3
-+
-+struct mmc_bus_ops {
-+ void (*remove)(struct mmc_host *);
-+ void (*detect)(struct mmc_host *);
+--- linux-2.6.22.4.orig/drivers/mmc/core/core.h 2007-09-22
22:42:48.100116966 +0200
++++ linux-2.6.22.4/drivers/mmc/core/core.h 2007-09-22 22:43:13.277551745
+0200
+@@ -18,6 +18,8 @@
+ struct mmc_bus_ops {
+ void (*remove)(struct mmc_host *);
+ void (*detect)(struct mmc_host *);
+ int (*sysfs_add)(struct mmc_host *, struct mmc_card *card);
+ void (*sysfs_remove)(struct mmc_host *, struct mmc_card *card);
-+ void (*suspend)(struct mmc_host *);
-+ void (*resume)(struct mmc_host *);
-+};
-+
-+void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);
-+void mmc_detach_bus(struct mmc_host *host);
-+
-+void mmc_set_chip_select(struct mmc_host *host, int mode);
-+void mmc_set_clock(struct mmc_host *host, unsigned int hz);
-+void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode);
-+void mmc_set_bus_width(struct mmc_host *host, unsigned int width);
-+u32 mmc_select_voltage(struct mmc_host *host, u32 ocr);
-+void mmc_set_timing(struct mmc_host *host, unsigned int timing);
-+
-+static inline void mmc_delay(unsigned int ms)
-+{
-+ if (ms < 1000 / HZ) {
-+ cond_resched();
-+ mdelay(ms);
-+ } else {
-+ msleep(ms);
-+ }
-+}
-+
+ void (*suspend)(struct mmc_host *);
+ void (*resume)(struct mmc_host *);
+ };
+@@ -25,28 +27,6 @@
+ void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);
+ void mmc_detach_bus(struct mmc_host *host);
+
+-void __mmc_release_bus(struct mmc_host *host);
+-
+-static inline void mmc_bus_get(struct mmc_host *host)
+-{
+- unsigned long flags;
+-
+- spin_lock_irqsave(&host->lock, flags);
+- host->bus_refs++;
+- spin_unlock_irqrestore(&host->lock, flags);
+-}
+-
+-static inline void mmc_bus_put(struct mmc_host *host)
+-{
+- unsigned long flags;
+-
+- spin_lock_irqsave(&host->lock, flags);
+- host->bus_refs--;
+- if ((host->bus_refs == 0) && host->bus_ops)
+- __mmc_release_bus(host);
+- spin_unlock_irqrestore(&host->lock, flags);
+-}
+-
+ void mmc_set_chip_select(struct mmc_host *host, int mode);
+ void mmc_set_clock(struct mmc_host *host, unsigned int hz);
+ void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode);
+@@ -54,8 +34,6 @@
+ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr);
+ void mmc_set_timing(struct mmc_host *host, unsigned int timing);
+
+-struct mmc_card *mmc_alloc_card(struct mmc_host *host);
+-
+ static inline void mmc_delay(unsigned int ms)
+ {
+ if (ms < 1000 / HZ) {
+@@ -66,5 +44,8 @@
+ }
+ }
+
+-#endif
+void mmc_rescan(struct work_struct *work);
+void mmc_start_host(struct mmc_host *host);
+void mmc_stop_host(struct mmc_host *host);
-+
+
+#endif
-+
-Index: drivers/mmc/core/host.c
+Index: linux-2.6.22.4/drivers/mmc/core/host.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/host.c 2007-09-11 02:48:17.373619764 +0200
++++ linux-2.6.22.4/drivers/mmc/core/host.c 2007-09-22 22:43:13.317554028
+0200
@@ -0,0 +1,162 @@
+/*
+ * linux/drivers/mmc/core/host.c
@@ -2724,10 +2728,10 @@
+
+EXPORT_SYMBOL(mmc_free_host);
+
-Index: drivers/mmc/core/host.h
+Index: linux-2.6.22.4/drivers/mmc/core/host.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/host.h 2007-09-11 02:48:17.397621133 +0200
++++ linux-2.6.22.4/drivers/mmc/core/host.h 2007-09-22 22:43:13.345555620
+0200
@@ -0,0 +1,18 @@
+/*
+ * linux/drivers/mmc/core/host.h
@@ -2747,31 +2751,10 @@
+
+#endif
+
-Index: drivers/mmc/core/Kconfig
+Index: linux-2.6.22.4/drivers/mmc/core/Makefile
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/Kconfig 2007-09-11 02:48:17.421622502 +0200
-@@ -0,0 +1,16 @@
-+#
-+# MMC core configuration
-+#
-+
-+config MMC_UNSAFE_RESUME
-+ bool "Allow unsafe resume (DANGEROUS)"
-+ help
-+ If you say Y here, the MMC layer will assume that all cards
-+ stayed in their respective slots during the suspend. The
-+ normal behaviour is to remove them at suspend and
-+ redetecting them at resume. Breaking this assumption will
-+ in most cases result in data corruption.
-+
-+ This option is usually just for embedded systems which use
-+ a MMC/SD card for rootfs. Most people should say N here.
-+
-Index: drivers/mmc/core/Makefile
-===================================================================
---- drivers/mmc/core/Makefile.orig 2007-09-11 02:47:57.700498662 +0200
-+++ drivers/mmc/core/Makefile 2007-09-11 02:48:17.449624099 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/core/Makefile 2007-09-22
22:42:48.124118335 +0200
++++ linux-2.6.22.4/drivers/mmc/core/Makefile 2007-09-22 22:43:13.369556989
+0200
@@ -7,5 +7,8 @@
endif
@@ -2782,10 +2765,10 @@
+ sdio.o sdio_ops.o sdio_bus.o \
+ sdio_cis.o sdio_io.o sdio_irq.o
-Index: drivers/mmc/core/mmc.c
+Index: linux-2.6.22.4/drivers/mmc/core/mmc.c
===================================================================
---- drivers/mmc/core/mmc.c.orig 2007-09-11 02:47:57.708499113 +0200
-+++ drivers/mmc/core/mmc.c 2007-09-11 02:48:17.469625239 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/core/mmc.c 2007-09-22 22:42:48.132118790
+0200
++++ linux-2.6.22.4/drivers/mmc/core/mmc.c 2007-09-22 22:43:13.389558129
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/mmc.c
@@ -3155,10 +3138,10 @@
+ return err;
}
-Index: drivers/mmc/core/mmc_ops.c
+Index: linux-2.6.22.4/drivers/mmc/core/mmc_ops.c
===================================================================
---- drivers/mmc/core/mmc_ops.c.orig 2007-09-11 02:47:57.716499571 +0200
-+++ drivers/mmc/core/mmc_ops.c 2007-09-11 02:48:17.493626603 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/core/mmc_ops.c 2007-09-22
22:42:48.136119019 +0200
++++ linux-2.6.22.4/drivers/mmc/core/mmc_ops.c 2007-09-22 22:43:13.417559727
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/mmc_ops.h
@@ -3282,42 +3265,21 @@
+ return 0;
}
-Index: drivers/mmc/core/mmc_ops.h
+Index: linux-2.6.22.4/drivers/mmc/core/mmc_ops.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/mmc_ops.h 2007-09-11 02:48:17.521628201 +0200
-@@ -0,0 +1,27 @@
-+/*
+--- linux-2.6.22.4.orig/drivers/mmc/core/mmc_ops.h 2007-09-22
22:42:48.144119475 +0200
++++ linux-2.6.22.4/drivers/mmc/core/mmc_ops.h 2007-09-22 22:43:13.445561319
+0200
+@@ -1,5 +1,5 @@
+ /*
+- * linux/drivers/mmc/mmc_ops.h
+ * linux/drivers/mmc/core/mmc_ops.h
-+ *
-+ * Copyright 2006-2007 Pierre Ossman
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or (at
-+ * your option) any later version.
-+ */
-+
-+#ifndef _MMC_MMC_OPS_H
-+#define _MMC_MMC_OPS_H
-+
-+int mmc_select_card(struct mmc_card *card);
-+int mmc_deselect_cards(struct mmc_host *host);
-+int mmc_go_idle(struct mmc_host *host);
-+int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr);
-+int mmc_all_send_cid(struct mmc_host *host, u32 *cid);
-+int mmc_set_relative_addr(struct mmc_card *card);
-+int mmc_send_csd(struct mmc_card *card, u32 *csd);
-+int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd);
-+int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value);
-+int mmc_send_status(struct mmc_card *card, u32 *status);
-+
-+#endif
-+
-Index: drivers/mmc/core/sd.c
+ *
+ * Copyright 2006-2007 Pierre Ossman
+ *
+Index: linux-2.6.22.4/drivers/mmc/core/sd.c
===================================================================
---- drivers/mmc/core/sd.c.orig 2007-09-11 02:47:57.728500253 +0200
-+++ drivers/mmc/core/sd.c 2007-09-11 02:48:17.545629571 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/core/sd.c 2007-09-22 22:42:48.152119930
+0200
++++ linux-2.6.22.4/drivers/mmc/core/sd.c 2007-09-22 22:55:37.003934297
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/sd.c
@@ -3740,10 +3702,10 @@
+ return err;
}
-Index: drivers/mmc/core/sdio_bus.c
+Index: linux-2.6.22.4/drivers/mmc/core/sdio_bus.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sdio_bus.c 2007-09-11 02:48:17.597632531 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sdio_bus.c 2007-09-22 22:43:13.489563828
+0200
@@ -0,0 +1,269 @@
+/*
+ * linux/drivers/mmc/core/sdio_bus.c
@@ -4014,10 +3976,10 @@
+ put_device(&func->dev);
+}
+
-Index: drivers/mmc/core/sdio_bus.h
+Index: linux-2.6.22.4/drivers/mmc/core/sdio_bus.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sdio_bus.h 2007-09-11 02:48:17.625634131 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sdio_bus.h 2007-09-22 22:43:13.537566566
+0200
@@ -0,0 +1,22 @@
+/*
+ * linux/drivers/mmc/core/sdio_bus.h
@@ -4041,10 +4003,10 @@
+
+#endif
+
-Index: drivers/mmc/core/sdio.c
+Index: linux-2.6.22.4/drivers/mmc/core/sdio.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sdio.c 2007-09-11 02:48:17.645635270 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sdio.c 2007-09-22 22:55:37.015934979
+0200
@@ -0,0 +1,382 @@
+/*
+ * linux/drivers/mmc/sdio.c
@@ -4428,10 +4390,10 @@
+ return err;
+}
+
-Index: drivers/mmc/core/sdio_cis.c
+Index: linux-2.6.22.4/drivers/mmc/core/sdio_cis.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sdio_cis.c 2007-09-11 02:48:17.669636637 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sdio_cis.c 2007-09-22 22:43:13.581569072
+0200
@@ -0,0 +1,404 @@
+/*
+ * linux/drivers/mmc/core/sdio_cis.c
@@ -4837,10 +4799,10 @@
+ put_device(&func->card->dev);
+}
+
-Index: drivers/mmc/core/sdio_cis.h
+Index: linux-2.6.22.4/drivers/mmc/core/sdio_cis.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sdio_cis.h 2007-09-11 02:48:17.701638459 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sdio_cis.h 2007-09-22 22:43:13.613570895
+0200
@@ -0,0 +1,23 @@
+/*
+ * linux/drivers/mmc/core/sdio_cis.h
@@ -4865,10 +4827,10 @@
+void sdio_free_func_cis(struct sdio_func *func);
+
+#endif
-Index: drivers/mmc/core/sdio_io.c
+Index: linux-2.6.22.4/drivers/mmc/core/sdio_io.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sdio_io.c 2007-09-11 02:48:17.721639599 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sdio_io.c 2007-09-22 22:43:13.905587535
+0200
@@ -0,0 +1,561 @@
+/*
+ * linux/drivers/mmc/core/sdio_io.c
@@ -5431,10 +5393,10 @@
+}
+
+EXPORT_SYMBOL_GPL(sdio_f0_writeb);
-Index: drivers/mmc/core/sdio_irq.c
+Index: linux-2.6.22.4/drivers/mmc/core/sdio_irq.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sdio_irq.c 2007-09-11 02:48:17.745640969 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sdio_irq.c 2007-09-22 22:43:14.093598251
+0200
@@ -0,0 +1,245 @@
+/*
+ * linux/drivers/mmc/core/sdio_irq.c
@@ -5681,10 +5643,10 @@
+
+EXPORT_SYMBOL_GPL(sdio_release_irq);
+
-Index: drivers/mmc/core/sdio_ops.c
+Index: linux-2.6.22.4/drivers/mmc/core/sdio_ops.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sdio_ops.c 2007-09-11 02:48:17.793643700 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sdio_ops.c 2007-09-22 22:43:14.121599847
+0200
@@ -0,0 +1,148 @@
+/*
+ * linux/drivers/mmc/sdio_ops.c
@@ -5834,10 +5796,10 @@
+ return 0;
+}
+
-Index: drivers/mmc/core/sdio_ops.h
+Index: linux-2.6.22.4/drivers/mmc/core/sdio_ops.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sdio_ops.h 2007-09-11 02:48:17.817645069 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sdio_ops.h 2007-09-22 22:43:14.145601212
+0200
@@ -0,0 +1,22 @@
+/*
+ * linux/drivers/mmc/sdio_ops.c
@@ -5861,10 +5823,10 @@
+
+#endif
+
-Index: drivers/mmc/core/sd_ops.c
+Index: linux-2.6.22.4/drivers/mmc/core/sd_ops.c
===================================================================
---- drivers/mmc/core/sd_ops.c.orig 2007-09-11 02:47:57.788503673 +0200
-+++ drivers/mmc/core/sd_ops.c 2007-09-11 02:48:17.837646209 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/core/sd_ops.c 2007-09-22
22:42:48.212123349 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sd_ops.c 2007-09-22 22:43:14.169602581
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/sd_ops.h
@@ -6086,39 +6048,10 @@
+ return 0;
}
-Index: drivers/mmc/core/sd_ops.h
+Index: linux-2.6.22.4/drivers/mmc/core/sysfs.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sd_ops.h 2007-09-11 02:48:17.865647808 +0200
-@@ -0,0 +1,24 @@
-+/*
-+ * linux/drivers/mmc/core/sd_ops.h
-+ *
-+ * Copyright 2006-2007 Pierre Ossman
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or (at
-+ * your option) any later version.
-+ */
-+
-+#ifndef _MMC_SD_OPS_H
-+#define _MMC_SD_OPS_H
-+
-+int mmc_app_set_bus_width(struct mmc_card *card, int width);
-+int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr);
-+int mmc_send_if_cond(struct mmc_host *host, u32 ocr);
-+int mmc_send_relative_addr(struct mmc_host *host, unsigned int *rca);
-+int mmc_app_send_scr(struct mmc_card *card, u32 *scr);
-+int mmc_sd_switch(struct mmc_card *card, int mode, int group,
-+ u8 value, u8 *resp);
-+
-+#endif
-+
-Index: drivers/mmc/core/sysfs.c
-===================================================================
---- drivers/mmc/core/sysfs.c.orig 2007-09-11 02:47:57.800504361 +0200
-+++ drivers/mmc/core/sysfs.c 2007-09-11 02:48:17.893649399 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/core/sysfs.c 2007-09-22
22:42:48.224124034 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sysfs.c 2007-09-22 22:43:14.197604179
+0200
@@ -2,6 +2,7 @@
* linux/drivers/mmc/core/sysfs.c
*
@@ -6494,41 +6427,10 @@
-module_init(mmc_init);
-module_exit(mmc_exit);
-Index: drivers/mmc/core/sysfs.h
+Index: linux-2.6.22.4/drivers/mmc/host/at91_mci.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ drivers/mmc/core/sysfs.h 2007-09-11 02:48:17.917650768 +0200
-@@ -0,0 +1,26 @@
-+/*
-+ * linux/drivers/mmc/core/sysfs.h
-+ *
-+ * Copyright (C) 2003 Russell King, All Rights Reserved.
-+ * Copyright 2007 Pierre Ossman
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#ifndef _MMC_CORE_SYSFS_H
-+#define _MMC_CORE_SYSFS_H
-+
-+#define MMC_ATTR_FN(name, fmt, args...)
\
-+static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute
*attr, char *buf) \
-+{ \
-+ struct mmc_card *card = container_of(dev, struct mmc_card, dev);\
-+ return sprintf(buf, fmt, args); \
-+}
-+
-+#define MMC_ATTR_RO(name) __ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
-+
-+int mmc_add_attrs(struct mmc_card *card, struct device_attribute *attrs);
-+void mmc_remove_attrs(struct mmc_card *card, struct device_attribute *attrs);
-+
-+#endif
-Index: drivers/mmc/host/at91_mci.c
-===================================================================
---- drivers/mmc/host/at91_mci.c.orig 2007-09-11 02:47:57.816505270 +0200
-+++ drivers/mmc/host/at91_mci.c 2007-09-11 02:48:17.957653047 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/at91_mci.c 2007-09-22
22:42:48.240124945 +0200
++++ linux-2.6.22.4/drivers/mmc/host/at91_mci.c 2007-09-22 22:43:14.217605319
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/at91_mci.c - ATMEL AT91 MCI Driver
@@ -7047,10 +6949,10 @@
if (mmc)
ret = mmc_resume_host(mmc);
-Index: drivers/mmc/host/au1xmmc.c
+Index: linux-2.6.22.4/drivers/mmc/host/au1xmmc.c
===================================================================
---- drivers/mmc/host/au1xmmc.c.orig 2007-09-11 02:47:57.824505727 +0200
-+++ drivers/mmc/host/au1xmmc.c 2007-09-11 02:48:17.981654416 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/au1xmmc.c 2007-09-22
22:42:48.248125400 +0200
++++ linux-2.6.22.4/drivers/mmc/host/au1xmmc.c 2007-09-22 22:43:14.261607825
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/au1xmmc.c - AU1XX0 MMC driver
@@ -7183,10 +7085,10 @@
/* In PIO mode, interrupts might still be enabled */
IRQ_OFF(host, SD_CONFIG_NE | SD_CONFIG_TH);
-Index: drivers/mmc/host/imxmmc.c
+Index: linux-2.6.22.4/drivers/mmc/host/imxmmc.c
===================================================================
---- drivers/mmc/host/imxmmc.c.orig 2007-09-11 02:47:57.828505952 +0200
-+++ drivers/mmc/host/imxmmc.c 2007-09-11 02:48:18.005655787 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/imxmmc.c 2007-09-22
22:42:48.256125858 +0200
++++ linux-2.6.22.4/drivers/mmc/host/imxmmc.c 2007-09-22 22:43:14.285609191
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/imxmmc.c - Motorola i.MX MMCI driver
@@ -7240,10 +7142,10 @@
imxmci_finish_data(host, stat);
if(host->req)
imxmci_finish_request(host, host->req);
-Index: drivers/mmc/host/mmci.c
+Index: linux-2.6.22.4/drivers/mmc/host/mmci.c
===================================================================
---- drivers/mmc/host/mmci.c.orig 2007-09-11 02:47:57.864508007 +0200
-+++ drivers/mmc/host/mmci.c 2007-09-11 02:48:18.061658975 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/mmci.c 2007-09-22
22:42:48.260126084 +0200
++++ linux-2.6.22.4/drivers/mmc/host/mmci.c 2007-09-22 22:43:14.309610559
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/mmci.c - ARM PrimeCell MMCI PL180/1 driver
@@ -7282,10 +7184,10 @@
if (host->data)
mmci_stop_data(host);
mmci_request_end(host, cmd->mrq);
-Index: drivers/mmc/host/mmci.h
+Index: linux-2.6.22.4/drivers/mmc/host/mmci.h
===================================================================
---- drivers/mmc/host/mmci.h.orig 2007-09-11 02:47:57.872508461 +0200
-+++ drivers/mmc/host/mmci.h 2007-09-11 02:48:18.105661486 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/mmci.h 2007-09-22
22:42:48.268126540 +0200
++++ linux-2.6.22.4/drivers/mmc/host/mmci.h 2007-09-22 22:43:14.333611928
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/mmci.h - ARM PrimeCell MMCI PL180/1 driver
@@ -7293,10 +7195,10 @@
*
* Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
*
-Index: drivers/mmc/host/omap.c
+Index: linux-2.6.22.4/drivers/mmc/host/omap.c
===================================================================
---- drivers/mmc/host/omap.c.orig 2007-09-11 02:47:57.880508920 +0200
-+++ drivers/mmc/host/omap.c 2007-09-11 02:48:18.133663077 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/omap.c 2007-09-22
22:42:48.276126998 +0200
++++ linux-2.6.22.4/drivers/mmc/host/omap.c 2007-09-22 22:43:14.361613524
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/media/mmc/omap.c
@@ -7357,10 +7259,10 @@
end_command = 1;
} else
dev_err(mmc_dev(host->mmc),
-Index: drivers/mmc/host/pxamci.c
+Index: linux-2.6.22.4/drivers/mmc/host/pxamci.c
===================================================================
---- drivers/mmc/host/pxamci.c.orig 2007-09-11 02:47:57.888509372 +0200
-+++ drivers/mmc/host/pxamci.c 2007-09-11 02:48:18.157664445 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/pxamci.c 2007-09-22
22:42:48.284127453 +0200
++++ linux-2.6.22.4/drivers/mmc/host/pxamci.c 2007-09-22 22:43:14.385614890
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/pxa.c - PXA MMCI driver
@@ -7412,10 +7314,10 @@
data->bytes_xfered = data->blocks * data->blksz;
else
data->bytes_xfered = 0;
-Index: drivers/mmc/host/pxamci.h
+Index: linux-2.6.22.4/drivers/mmc/host/pxamci.h
===================================================================
---- drivers/mmc/host/pxamci.h.orig 2007-09-11 02:47:57.896509829 +0200
-+++ drivers/mmc/host/pxamci.h 2007-09-11 02:48:18.185666045 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/pxamci.h 2007-09-22
22:42:48.288127680 +0200
++++ linux-2.6.22.4/drivers/mmc/host/pxamci.h 2007-09-22 22:43:14.413616487
+0200
@@ -1,25 +1,3 @@
-#undef MMC_STRPCL
-#undef MMC_STAT
@@ -7442,10 +7344,10 @@
#define MMC_STRPCL 0x0000
#define STOP_CLOCK (1 << 0)
#define START_CLOCK (2 << 0)
-Index: drivers/mmc/host/sdhci.c
+Index: linux-2.6.22.4/drivers/mmc/host/sdhci.c
===================================================================
---- drivers/mmc/host/sdhci.c.orig 2007-09-11 02:47:57.916510969 +0200
-+++ drivers/mmc/host/sdhci.c 2007-09-11 02:48:18.185666045 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/sdhci.c 2007-09-22
22:42:48.296128138 +0200
++++ linux-2.6.22.4/drivers/mmc/host/sdhci.c 2007-09-22 22:55:37.019935208
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/sdhci.c - Secure Digital Host Controller Interface
driver
@@ -7870,10 +7772,10 @@
/*
* Maximum block count.
-Index: drivers/mmc/host/sdhci.h
+Index: linux-2.6.22.4/drivers/mmc/host/sdhci.h
===================================================================
---- drivers/mmc/host/sdhci.h.orig 2007-09-11 02:47:57.932511880 +0200
-+++ drivers/mmc/host/sdhci.h 2007-09-11 02:48:18.225668324 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/sdhci.h 2007-09-22
22:42:48.304128593 +0200
++++ linux-2.6.22.4/drivers/mmc/host/sdhci.h 2007-09-22 22:43:14.477620136
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/sdhci.h - Secure Digital Host Controller Interface
driver
@@ -7897,10 +7799,10 @@
struct scatterlist *cur_sg; /* We're working on this */
int num_sg; /* Entries left */
-Index: drivers/mmc/host/tifm_sd.c
+Index: linux-2.6.22.4/drivers/mmc/host/tifm_sd.c
===================================================================
---- drivers/mmc/host/tifm_sd.c.orig 2007-09-11 02:47:57.936512109 +0200
-+++ drivers/mmc/host/tifm_sd.c 2007-09-11 02:48:18.249669691 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/tifm_sd.c 2007-09-22
22:42:48.312129048 +0200
++++ linux-2.6.22.4/drivers/mmc/host/tifm_sd.c 2007-09-22 22:43:14.501621503
+0200
@@ -404,14 +404,14 @@
struct tifm_dev *sock = host->dev;
struct mmc_command *cmd = host->req->cmd;
@@ -7968,10 +7870,10 @@
tasklet_schedule(&host->finish_tasklet);
}
spin_unlock_irqrestore(&sock->lock, flags);
-Index: drivers/mmc/host/wbsd.c
+Index: linux-2.6.22.4/drivers/mmc/host/wbsd.c
===================================================================
---- drivers/mmc/host/wbsd.c.orig 2007-09-11 02:47:57.944512566 +0200
-+++ drivers/mmc/host/wbsd.c 2007-09-11 02:48:18.273671055 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/wbsd.c 2007-09-22
22:42:48.316129277 +0200
++++ linux-2.6.22.4/drivers/mmc/host/wbsd.c 2007-09-22 22:43:14.529623097
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/wbsd.c - Winbond W83L51xD SD/MMC driver
@@ -8229,10 +8131,10 @@
{
wbsd_release_dma(host);
wbsd_release_irq(host);
-Index: drivers/mmc/host/wbsd.h
+Index: linux-2.6.22.4/drivers/mmc/host/wbsd.h
===================================================================
---- drivers/mmc/host/wbsd.h.orig 2007-09-11 02:47:57.956513249 +0200
-+++ drivers/mmc/host/wbsd.h 2007-09-11 02:48:18.297672424 +0200
+--- linux-2.6.22.4.orig/drivers/mmc/host/wbsd.h 2007-09-22
22:42:48.328129959 +0200
++++ linux-2.6.22.4/drivers/mmc/host/wbsd.h 2007-09-22 22:43:14.553624466
+0200
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mmc/wbsd.h - Winbond W83L51xD SD/MMC driver
@@ -8240,10 +8142,10 @@
*
* Copyright (C) 2004-2007 Pierre Ossman, All Rights Reserved.
*
-Index: include/linux/mmc/card.h
+Index: linux-2.6.22.4/include/linux/mmc/card.h
===================================================================
---- include/linux/mmc/card.h.orig 2007-09-11 02:47:57.964513706 +0200
-+++ include/linux/mmc/card.h 2007-09-11 02:48:18.349675390 +0200
+--- linux-2.6.22.4.orig/include/linux/mmc/card.h 2007-09-22
22:42:48.332130188 +0200
++++ linux-2.6.22.4/include/linux/mmc/card.h 2007-09-22 22:43:14.593626745
+0200
@@ -55,7 +55,28 @@
unsigned int hs_max_dtr;
};
@@ -8305,10 +8207,10 @@
#define mmc_card_present(c) ((c)->state & MMC_STATE_PRESENT)
#define mmc_card_readonly(c) ((c)->state & MMC_STATE_READONLY)
-Index: include/linux/mmc/core.h
+Index: linux-2.6.22.4/include/linux/mmc/core.h
===================================================================
---- include/linux/mmc/core.h.orig 2007-09-11 02:47:57.972514160 +0200
-+++ include/linux/mmc/core.h 2007-09-11 02:48:18.365676303 +0200
+--- linux-2.6.22.4.orig/include/linux/mmc/core.h 2007-09-22
22:42:48.340130644 +0200
++++ linux-2.6.22.4/include/linux/mmc/core.h 2007-09-22 22:43:14.613627885
+0200
@@ -41,6 +41,8 @@
#define MMC_RSP_R1B
(MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY)
#define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC)
@@ -8373,10 +8275,10 @@
+}
+
#endif
-Index: include/linux/mmc/host.h
+Index: linux-2.6.22.4/include/linux/mmc/host.h
===================================================================
---- include/linux/mmc/host.h.orig 2007-09-11 02:47:57.980514619 +0200
-+++ include/linux/mmc/host.h 2007-09-11 02:48:18.389677669 +0200
+--- linux-2.6.22.4.orig/include/linux/mmc/host.h 2007-09-22
22:42:48.348131099 +0200
++++ linux-2.6.22.4/include/linux/mmc/host.h 2007-09-22 22:55:36.999934069
+0200
@@ -51,6 +51,7 @@
void (*request)(struct mmc_host *host, struct mmc_request *req);
void (*set_ios)(struct mmc_host *host, struct mmc_ios *ios);
@@ -8416,13 +8318,13 @@
+
#endif
-Index: include/linux/mmc/sdio_func.h
+Index: linux-2.6.22.4/include/linux/mmc/sdio_func.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ include/linux/mmc/sdio_func.h 2007-09-11 02:48:18.417679263 +0200
++++ linux-2.6.22.4/include/linux/mmc/sdio_func.h 2007-09-22
22:55:35.343839692 +0200
@@ -0,0 +1,150 @@
+/*
-+ * include/linux/mmc/sdio_func.h
++ * linux/include/linux/mmc/sdio_func.h
+ *
+ * Copyright 2007 Pierre Ossman
+ *
@@ -8571,13 +8473,13 @@
+
+#endif
+
-Index: include/linux/mmc/sdio.h
+Index: linux-2.6.22.4/include/linux/mmc/sdio.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ include/linux/mmc/sdio.h 2007-09-11 02:48:18.441680631 +0200
++++ linux-2.6.22.4/include/linux/mmc/sdio.h 2007-09-22 22:43:14.661630621
+0200
@@ -0,0 +1,159 @@
+/*
-+ * include/linux/mmc/sdio.h
++ * linux/include/linux/mmc/sdio.h
+ *
+ * Copyright 2006-2007 Pierre Ossman
+ *
@@ -8735,10 +8637,10 @@
+
+#endif
+
-Index: include/linux/mmc/sdio_ids.h
+Index: linux-2.6.22.4/include/linux/mmc/sdio_ids.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ include/linux/mmc/sdio_ids.h 2007-09-11 02:48:18.469682229 +0200
++++ linux-2.6.22.4/include/linux/mmc/sdio_ids.h 2007-09-22
22:43:14.681631761 +0200
@@ -0,0 +1,23 @@
+/*
+ * SDIO Classes, Interface Types, Manufacturer IDs, etc.
@@ -8763,10 +8665,10 @@
+
+
+#endif
-Index: include/linux/mod_devicetable.h
+Index: linux-2.6.22.4/include/linux/mod_devicetable.h
===================================================================
---- include/linux/mod_devicetable.h.orig 2007-09-11 02:47:58.012516439
+0200
-+++ include/linux/mod_devicetable.h 2007-09-11 02:48:18.493683593 +0200
+--- linux-2.6.22.4.orig/include/linux/mod_devicetable.h 2007-09-22
22:42:48.372132468 +0200
++++ linux-2.6.22.4/include/linux/mod_devicetable.h 2007-09-22
22:43:14.697632674 +0200
@@ -333,4 +333,15 @@
#define PA_HVERSION_ANY_ID 0xffff
#define PA_SVERSION_ANY_ID 0xffffffff
@@ -8783,10 +8685,10 @@
+};
+
#endif /* LINUX_MOD_DEVICETABLE_H */
-Index: scripts/mod/file2alias.c
+Index: linux-2.6.22.4/scripts/mod/file2alias.c
===================================================================
---- scripts/mod/file2alias.c.orig 2007-09-11 02:47:58.024517125 +0200
-+++ scripts/mod/file2alias.c 2007-09-11 02:48:18.517684962 +0200
+--- linux-2.6.22.4.orig/scripts/mod/file2alias.c 2007-09-22
22:42:48.384133152 +0200
++++ linux-2.6.22.4/scripts/mod/file2alias.c 2007-09-22 22:43:14.713633584
+0200
@@ -476,6 +476,22 @@
return 1;
}
@@ -8821,3 +8723,53 @@
}
/* Now add out buffered information to the generated C source */
+Index: linux-2.6.22.4/drivers/mmc/core/sd_ops.h
+===================================================================
+--- linux-2.6.22.4.orig/drivers/mmc/core/sd_ops.h 2007-09-22
22:57:28.634295749 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sd_ops.h 2007-09-22 22:57:32.882537845
+0200
+@@ -1,5 +1,5 @@
+ /*
+- * linux/drivers/mmc/sd_ops.h
++ * linux/drivers/mmc/core/sd_ops.h
+ *
+ * Copyright 2006-2007 Pierre Ossman
+ *
+@@ -12,7 +12,6 @@
+ #ifndef _MMC_SD_OPS_H
+ #define _MMC_SD_OPS_H
+
+-int mmc_app_cmd(struct mmc_host *host, struct mmc_card *card);
+ int mmc_app_set_bus_width(struct mmc_card *card, int width);
+ int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr);
+ int mmc_send_if_cond(struct mmc_host *host, u32 ocr);
+Index: linux-2.6.22.4/drivers/mmc/core/sysfs.h
+===================================================================
+--- linux-2.6.22.4.orig/drivers/mmc/core/sysfs.h 2007-09-22
22:57:10.561265826 +0200
++++ linux-2.6.22.4/drivers/mmc/core/sysfs.h 2007-09-22 22:57:32.922540125
+0200
+@@ -11,17 +11,16 @@
+ #ifndef _MMC_CORE_SYSFS_H
+ #define _MMC_CORE_SYSFS_H
+
+-void mmc_init_card(struct mmc_card *card, struct mmc_host *host);
+-int mmc_register_card(struct mmc_card *card);
+-void mmc_remove_card(struct mmc_card *card);
++#define MMC_ATTR_FN(name, fmt, args...)
\
++static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute
*attr, char *buf) \
++{ \
++ struct mmc_card *card = container_of(dev, struct mmc_card, dev);\
++ return sprintf(buf, fmt, args); \
++}
+
+-struct mmc_host *mmc_alloc_host_sysfs(int extra, struct device *dev);
+-int mmc_add_host_sysfs(struct mmc_host *host);
+-void mmc_remove_host_sysfs(struct mmc_host *host);
+-void mmc_free_host_sysfs(struct mmc_host *host);
++#define MMC_ATTR_RO(name) __ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
+
+-int mmc_schedule_work(struct work_struct *work);
+-int mmc_schedule_delayed_work(struct delayed_work *work, unsigned long delay);
+-void mmc_flush_scheduled_work(void);
++int mmc_add_attrs(struct mmc_card *card, struct device_attribute *attrs);
++void mmc_remove_attrs(struct mmc_card *card, struct device_attribute *attrs);
+
+ #endif
Added: developers/nbd/patches/130-gta02v2.patch
===================================================================
--- developers/nbd/patches/130-gta02v2.patch 2007-10-01 16:12:59 UTC (rev
3066)
+++ developers/nbd/patches/130-gta02v2.patch 2007-10-01 19:14:46 UTC (rev
3067)
@@ -0,0 +1,25 @@
+Index: linux-2.6.22.4/arch/arm/mach-s3c2440/Kconfig
+===================================================================
+--- linux-2.6.22.4.orig/arch/arm/mach-s3c2440/Kconfig 2007-10-01
17:58:09.939786681 +0200
++++ linux-2.6.22.4/arch/arm/mach-s3c2440/Kconfig 2007-10-01
17:58:17.540219803 +0200
+@@ -76,6 +76,7 @@
+ config MACH_NEO1973_GTA02
+ bool "FIC Neo1973 GSM Phone (GTA02 Hardware)"
+ select CPU_S3C2440
++ select CPU_S3C2442
+ select SENSORS_PCF50633
+ help
+ Say Y here if you are using the FIC Neo1973 GSM Phone
+Index: linux-2.6.22.4/arch/arm/mach-s3c2440/mach-gta02.c
+===================================================================
+--- linux-2.6.22.4.orig/arch/arm/mach-s3c2440/mach-gta02.c 2007-10-01
19:55:03.151446840 +0200
++++ linux-2.6.22.4/arch/arm/mach-s3c2440/mach-gta02.c 2007-10-01
19:55:10.179847366 +0200
+@@ -306,7 +306,7 @@
+ &s3c_device_wdt,
+ &s3c_device_i2c,
+ &s3c_device_iis,
+- // &s3c_device_sdi, /* FIXME: temporary disable to avoid s3cmci bind */
++ &s3c_device_sdi,
+ &s3c_device_usbgadget,
+ &s3c_device_nand,
+ &s3c_device_ts,
--- End Message ---
