patch kernel 2.4.21 (including the arm-linux patch rmk2) with the latest CVS snapshot

[Martin Donnelly]

On Thu, 2004-04-15 at 09:58, Martin Donnelly wrote:
> Apply the two attached patches chips-config.patch to
> 'drivers/mtd/chips/Config.in' and nand-config.patch to
> 'drivers/mtd/nand/Config.in' which should sort out a couple of syntax
> errors. e.g `cd linux-2.4.21; patch -p1 -i chips-config.patch`

And it helps if the patches are attached :-)

Cheers
-- 
Martin Donnelly

-------------- next part --------------
--- linux-2.4.22/drivers/mtd/chips/Config.in.orig	2004-04-13 16:40:33.000000000 +0100
+++ linux-2.4.22/drivers/mtd/chips/Config.in	2004-04-13 16:41:20.000000000 +0100
@@ -11,10 +11,12 @@
 
 if [ "$CONFIG_MTD_CFI" = "y" -o "$CONFIG_MTD_JEDECPROBE" = "y" ]; then
    define_bool CONFIG_MTD_GEN_PROBE y
-elif [ "$CONFIG_MTD_CFI" = "m" -o "$CONFIG_MTD_JEDECPROBE" = "m" ]; then
-   define_bool CONFIG_MTD_GEN_PROBE m
 else
-   define_bool CONFIG_MTD_GEN_PROBE n
+   if [ "$CONFIG_MTD_CFI" = "m" -o "$CONFIG_MTD_JEDECPROBE" = "m" ]; then
+      define_bool CONFIG_MTD_GEN_PROBE m
+   else
+      define_bool CONFIG_MTD_GEN_PROBE n
+   fi
 fi
 
 if [ "$CONFIG_MTD_GEN_PROBE" = "y" -o "$CONFIG_MTD_GEN_PROBE" = "m" ]; then
@@ -49,12 +51,14 @@
 	-o "$CONFIG_MTD_CFI_AMDSTD" = "y" \
 	-o "$CONFIG_MTD_CFI_STAA" = "y" ]; then
    define_bool CONFIG_MTD_CFI_UTIL y
-elif [ "$CONFIG_MTD_CFI_INTELEXT" = "m" \
-	-o "$CONFIG_MTD_CFI_AMDSTD" = "m" \
-	-o "$CONFIG_MTD_CFI_STAA" = "m" ]; then
-   define_bool CONFIG_MTD_CFI_UTIL m
 else
-   define_bool CONFIG_MTD_CFI_UTIL n
+   if [ "$CONFIG_MTD_CFI_INTELEXT" = "m" \
+	 -o "$CONFIG_MTD_CFI_AMDSTD" = "m" \
+	 -o "$CONFIG_MTD_CFI_STAA" = "m" ]; then
+      define_bool CONFIG_MTD_CFI_UTIL m
+   else
+      define_bool CONFIG_MTD_CFI_UTIL n
+   fi
 fi
 
 dep_tristate '  Support for RAM chips in bus mapping' CONFIG_MTD_RAM $CONFIG_MTD
-------------- next part --------------
--- linux-2.4.22/drivers/mtd/nand/Config.in.orig	2004-04-13 16:47:02.000000000 +0100
+++ linux-2.4.22/drivers/mtd/nand/Config.in	2004-04-13 16:47:23.000000000 +0100
@@ -35,7 +35,6 @@
 fi
 
 if [ "$CONFIG_PPCHAMELEONEVB" = "y" ]; then
-    dep_tristate '  NAND Flash device on PPChameleonEVB board' 
-    CONFIG_MTD_NAND_PPCHAMELEONEVB $CONFIG_MTD_NAND
+    dep_tristate '  NAND Flash device on PPChameleonEVB board' CONFIG_MTD_NAND_PPCHAMELEONEVB $CONFIG_MTD_NAND
 fi
 endmenu