aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.32/110-flash.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-11-28 18:14:34 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-11-28 18:14:34 +0000
commita133b09b0706df0a93eb268c17a92a7a543f968a (patch)
tree94a642e894c37cfa1e42944e021430a33d908db8 /target/linux/ar7/patches-2.6.32/110-flash.patch
parent27189b328e34085febb58528c40fb9b1632b04b2 (diff)
downloadupstream-a133b09b0706df0a93eb268c17a92a7a543f968a.tar.gz
upstream-a133b09b0706df0a93eb268c17a92a7a543f968a.tar.bz2
upstream-a133b09b0706df0a93eb268c17a92a7a543f968a.zip
refresh patches and remove trailing whitespaces
SVN-Revision: 24181
Diffstat (limited to 'target/linux/ar7/patches-2.6.32/110-flash.patch')
-rw-r--r--target/linux/ar7/patches-2.6.32/110-flash.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/ar7/patches-2.6.32/110-flash.patch b/target/linux/ar7/patches-2.6.32/110-flash.patch
index e1ba17a8f7..ae39770f29 100644
--- a/target/linux/ar7/patches-2.6.32/110-flash.patch
+++ b/target/linux/ar7/patches-2.6.32/110-flash.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.25/drivers/mtd/maps/physmap.c
-===================================================================
---- linux-2.6.32.25.orig/drivers/mtd/maps/physmap.c 2010-10-28 21:47:22.000000000 -0700
-+++ linux-2.6.32.25/drivers/mtd/maps/physmap.c 2010-11-16 08:14:11.469582161 -0800
-@@ -80,7 +80,7 @@
+--- a/drivers/mtd/maps/physmap.c
++++ b/drivers/mtd/maps/physmap.c
+@@ -80,7 +80,7 @@ static const char *rom_probe_types[] = {
"map_rom",
NULL };
#ifdef CONFIG_MTD_PARTITIONS
@@ -11,11 +9,9 @@ Index: linux-2.6.32.25/drivers/mtd/maps/physmap.c
#endif
static int physmap_flash_probe(struct platform_device *dev)
-Index: linux-2.6.32.25/arch/mips/ar7/platform.c
-===================================================================
---- linux-2.6.32.25.orig/arch/mips/ar7/platform.c 2010-11-16 08:17:41.352090063 -0800
-+++ linux-2.6.32.25/arch/mips/ar7/platform.c 2010-11-16 08:18:09.232119441 -0800
-@@ -98,7 +98,7 @@
+--- a/arch/mips/ar7/platform.c
++++ b/arch/mips/ar7/platform.c
+@@ -98,7 +98,7 @@ static struct resource physmap_flash_res
.name = "mem",
.flags = IORESOURCE_MEM,
.start = 0x10000000,