upgrade orion to 2.6.28-rc7
[openwrt/staging/florian.git] / target / linux / orion / patches / 050-wrt350nv2_cfi_workaround.patch
1 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
2 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
3 @@ -364,8 +364,9 @@ struct mtd_info *cfi_cmdset_0002(struct
4 return NULL;
5 }
6
7 - if (extp->MajorVersion != '1' ||
8 - (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
9 + if ((extp->MajorVersion != '0' && extp->MinorVersion != '0') &&
10 + (extp->MajorVersion != '1' ||
11 + (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {
12 if (cfi->mfr == MANUFACTURER_SAMSUNG &&
13 (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
14 printk(KERN_NOTICE " Newer Samsung flash detected, "