X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric-2.6%2Fpatches%2F007-samsung_flash.patch;h=8c9400308158380f36ac99e0c1ad8519f561cfb7;hb=541ff27cfb26939cf1b98b73fa5aeea0d8432082;hp=93e371fa92f1a850b5dfc14ce2ab26d0273f1a9e;hpb=944dc841005d29fffe025e3b6798a2d476090c8c;p=openwrt-10.03%2F.git

diff --git a/target/linux/generic-2.6/patches/007-samsung_flash.patch b/target/linux/generic-2.6/patches/007-samsung_flash.patch
index 93e371fa9..8c9400308 100644
--- a/target/linux/generic-2.6/patches/007-samsung_flash.patch
+++ b/target/linux/generic-2.6/patches/007-samsung_flash.patch
@@ -1,25 +1,24 @@
---- linux.old/drivers/mtd/chips/cfi_cmdset_0002.c	2006-10-23 21:14:11.618024794 +0200
-+++ linux.dev/drivers/mtd/chips/cfi_cmdset_0002.c	2006-10-24 07:47:52.267007586 +0200
-@@ -49,6 +49,7 @@
- #define MANUFACTURER_SST	0x00BF
- #define SST49LF004B	        0x0060
+diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c
+--- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c	2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c	2007-05-26 19:30:01.049193968 +0200
+@@ -51,6 +51,7 @@
+ #define SST49LF040B	        0x0050
  #define SST49LF008A		0x005a
+ #define AT49BV6416		0x00d6
 +#define MANUFACTURER_SAMSUNG	0x00ec
  
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -254,13 +255,20 @@
- 		}
+@@ -294,12 +295,19 @@
  
  		if (extp->MajorVersion != '1' ||
--		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
+ 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
 -			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
 -			       "version %c.%c.\n",  extp->MajorVersion,
 -			       extp->MinorVersion);
 -			kfree(extp);
 -			kfree(mtd);
 -			return NULL;
-+		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
 +		        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
 +			    (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
 +			    printk(KERN_NOTICE "  Newer Samsung flash detected, "