aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
commitdcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch)
treeb152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch
parent59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff)
downloadmaster-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz
master-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2
master-187ad058-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/473-mtd_m25p80_add_w25q128.patch')
-rw-r--r--target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch b/target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch
index 290f4f6b8b..d731d1279a 100644
--- a/target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch
+++ b/target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -765,6 +765,7 @@ static const struct spi_device_id m25p_i
+@@ -739,6 +739,7 @@ static const struct spi_device_id m25p_i
{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },