--- linux_with_mtd_bugs/drivers/mtd/mtd_blkdevs-24.c	2004-12-27 14:48:52.000000000 +0100
+++ linux/drivers/mtd/mtd_blkdevs-24.c	2004-12-29 14:32:14.000000000 +0100
@@ -315,7 +315,7 @@
 	}
 
 	grok_partitions(gd, minor, 1 << tr->part_bits, 
-			tr->blkcore_priv->sizes[minor]);
+                        dev->size);
 	up(&mtd_table_mutex);
 
 	return 0;
--- linux_with_mtd_bugs/include/linux/mtd/map.h	2004-12-27 14:48:54.000000000 +0100
+++ linux/include/linux/mtd/map.h	2004-12-27 15:33:58.000000000 +0100
@@ -14,6 +14,10 @@
 #include <asm/io.h>
 #include <asm/bug.h>
 
+#ifndef CONFIG_MTD_CFI_GEOMETRY
+#define CONFIG_MTD_MAP_BANK_WIDTH_1
+#endif
+
 #ifdef CONFIG_MTD_MAP_BANK_WIDTH_1
 #define map_bankwidth(map) 1
 #define map_bankwidth_is_1(map) (map_bankwidth(map) == 1)
--- linux_with_mtd_bugs/drivers/mtd/nand/diskonchip.c	2004-12-27 14:48:53.000000000 +0100
+++ linux/drivers/mtd/nand/diskonchip.c	2004-12-27 13:39:56.000000000 +0100
@@ -24,6 +24,8 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/rslib.h>
+#include <linux/moduleparam.h>
+#include <linux/rslib.h>
 #include <asm/io.h>
 
 #include <linux/mtd/mtd.h>
--- linux_with_mtd_bugs/lib/Config.in	2004-12-27 14:48:54.000000000 +0100
+++ linux/lib/Config.in	2004-12-29 14:37:35.000000000 +0100
@@ -43,13 +43,15 @@
 
 if [ "$CONFIG_MTD_DOCPROBE" = "y" -o \
      "$CONFIG_MTD_NAND_RTC_FROM4" = "y" -o \
-     "$MTD_NAND_DISKONCHIP" = "y" ]; then
+     "$CONFIG_MTD_NAND_DISKONCHIP" = "y" ]; then
    define_tristate CONFIG_REED_SOLOMON y
+   define_tristate CONFIG_REED_SOLOMON_DEC16 y
 else
   if [ "$CONFIG_MTD_DOCPROBE" = "m" -o \
      "$CONFIG_MTD_NAND_RTC_FROM4" = "m" -o \
-     "$MTD_NAND_DISKONCHIP" = "m" ]; then
+     "$CONFIG_MTD_NAND_DISKONCHIP" = "m" ]; then
      define_tristate CONFIG_REED_SOLOMON m
+     define_tristate CONFIG_REED_SOLOMON_DEC16 y
   else
      define_tristate CONFIG_REED_SOLOMON n
   fi