aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-02-08 09:37:16 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-02-08 09:37:16 +0000
commitd2cd6f3b9999359533ecd8f5b3af8ceb5d0c8d4c (patch)
tree7f27b4bdc715d7c7939de3d456570653e615f1b1
parentc25bf09111d91d4e5bf74eed69813a21d6e36eba (diff)
downloadupstream-d2cd6f3b9999359533ecd8f5b3af8ceb5d0c8d4c.tar.gz
upstream-d2cd6f3b9999359533ecd8f5b3af8ceb5d0c8d4c.tar.bz2
upstream-d2cd6f3b9999359533ecd8f5b3af8ceb5d0c8d4c.zip
kernel: 2.6.32: integrate m25p80 driver related patches from ar71xx
SVN-Revision: 19547
-rw-r--r--target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/083-mtd_fix_nand_correct_data_return_code.patch (renamed from target/linux/generic-2.6/patches-2.6.32/090-mtd_fix_nand_correct_data_return_code.patch)0
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch (renamed from target/linux/ar71xx/patches-2.6.32/100-mtd_m25p80_add_pm25lv_flash_support.patch)0
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch (renamed from target/linux/ar71xx/patches-2.6.32/103-mtd_m25p80_add_en25pxx_support.patch)0
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch (renamed from target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch)0
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch (renamed from target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch)0
8 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch
index 7b28fe4182..320c76a0cc 100644
--- a/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -856,6 +856,16 @@ static int __devinit m25p_probe(struct s
+@@ -867,6 +867,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
diff --git a/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch
index d4a8ce9a4a..dbcdde088f 100644
--- a/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -870,6 +870,15 @@ static int __devinit m25p_probe(struct s
+@@ -877,6 +877,15 @@ static int __devinit m25p_probe(struct s
}
#endif
diff --git a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch
index 52f54e6ce8..7af88432a0 100644
--- a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -885,6 +885,16 @@ static int __devinit m25p_probe(struct s
+@@ -886,6 +886,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
#endif
diff --git a/target/linux/generic-2.6/patches-2.6.32/090-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.32/083-mtd_fix_nand_correct_data_return_code.patch
index 97148d07d0..97148d07d0 100644
--- a/target/linux/generic-2.6/patches-2.6.32/090-mtd_fix_nand_correct_data_return_code.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/083-mtd_fix_nand_correct_data_return_code.patch
diff --git a/target/linux/ar71xx/patches-2.6.32/100-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic-2.6/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch
index 30c5cc9529..30c5cc9529 100644
--- a/target/linux/ar71xx/patches-2.6.32/100-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch
diff --git a/target/linux/ar71xx/patches-2.6.32/103-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic-2.6/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch
index d3bd1dd5ef..d3bd1dd5ef 100644
--- a/target/linux/ar71xx/patches-2.6.32/103-mtd_m25p80_add_en25pxx_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch
diff --git a/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
index 0c7c227ed8..0c7c227ed8 100644
--- a/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
diff --git a/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic-2.6/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch
index 5f44c1d696..5f44c1d696 100644
--- a/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch