1 --- linux.old/drivers/mtd/chips/cfi_cmdset_0002.c 2006-10-23 21:14:11.618024794 +0200
2 +++ linux.dev/drivers/mtd/chips/cfi_cmdset_0002.c 2006-10-24 07:47:52.267007586 +0200
4 #define MANUFACTURER_SST 0x00BF
5 #define SST49LF004B 0x0060
6 #define SST49LF008A 0x005a
7 +#define MANUFACTURER_SAMSUNG 0x00ec
9 static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
10 static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
14 if (extp->MajorVersion != '1' ||
15 - (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
16 - printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query "
17 - "version %c.%c.\n", extp->MajorVersion,
18 - extp->MinorVersion);
22 + (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
23 + if (cfi->mfr == MANUFACTURER_SAMSUNG &&
24 + (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
25 + printk(KERN_NOTICE " Newer Samsung flash detected, "
26 + "should be compatibile with Amd/Fujitsu.\n");
29 + printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query "
30 + "version %c.%c.\n", extp->MajorVersion,
31 + extp->MinorVersion);
38 /* Install our own private info structure */