diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
commit | dcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch) | |
tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch | |
parent | 59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff) | |
download | upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2 upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip |
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch')
-rw-r--r-- | target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch index 231d4548c7..270586ea74 100644 --- a/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch +++ b/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch @@ -1,8 +1,8 @@ --- a/drivers/mtd/devices/Kconfig +++ b/drivers/mtd/devices/Kconfig -@@ -102,6 +102,14 @@ config M25PXX_USE_FAST_READ +@@ -110,6 +110,14 @@ config MTD_SPEAR_SMI help - This option enables FAST_READ access supported by ST M25Pxx. + This enable SNOR support on SPEAR platforms using SMI controller +config M25PXX_PREFER_SMALL_SECTOR_ERASE + bool "Prefer small sector erase" @@ -30,8 +30,8 @@ /****************************************************************************/ struct m25p { -@@ -925,7 +931,7 @@ static int __devinit m25p_probe(struct s - flash->mtd.write = m25p80_write; +@@ -899,7 +905,7 @@ static int __devinit m25p_probe(struct s + flash->mtd._write = m25p80_write; /* prefer "small sector" erase if possible */ - if (info->flags & SECT_4K) { |