aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-01-25 10:24:27 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-01-25 10:24:27 +0000
commit62e8fbd7ae82aead2ba6a7cbd591df6bb4fc9445 (patch)
tree1407ca5378507c4dfa989bac4d9ada4e552f3176 /target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch
parent9bfd655af3f19baf1bdc79da02b2b3f4ea549a5e (diff)
downloadupstream-62e8fbd7ae82aead2ba6a7cbd591df6bb4fc9445.tar.gz
upstream-62e8fbd7ae82aead2ba6a7cbd591df6bb4fc9445.tar.bz2
upstream-62e8fbd7ae82aead2ba6a7cbd591df6bb4fc9445.zip
generic: remove en25pxx support patch, it is in mainline since 2.6.36
SVN-Revision: 25097
Diffstat (limited to 'target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch')
-rw-r--r--target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch b/target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch
index 5de170dfee..19e3e5c038 100644
--- a/target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch
+++ b/target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch
@@ -1,8 +1,8 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -656,7 +656,8 @@ static const struct spi_device_id m25p_i
- { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
+@@ -639,7 +639,8 @@ static const struct spi_device_id m25p_i
+ { "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32, SECT_4K) },
+ { "at26df321", INFO(0x1f4701, 0, 64 * 1024, 64, SECT_4K) },
- /* EON -- en25pxx */
+ /* EON -- en25xxx */