aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-10-11 20:25:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-10-11 20:25:30 +0000
commit2b9c37f9618ae986731b033275d6a37e97a31028 (patch)
tree3a258c4ceda1d1c27bef1c64ca274358c84a4437
parent851f1d77132e29162aed887e08fa1875b9f4034d (diff)
downloadupstream-2b9c37f9618ae986731b033275d6a37e97a31028.tar.gz
upstream-2b9c37f9618ae986731b033275d6a37e97a31028.tar.bz2
upstream-2b9c37f9618ae986731b033275d6a37e97a31028.zip
another compile fix
SVN-Revision: 5052
-rw-r--r--openwrt/target/linux/rb532-2.6/patches/100-rb5xx_support.patch18
1 files changed, 10 insertions, 8 deletions
diff --git a/openwrt/target/linux/rb532-2.6/patches/100-rb5xx_support.patch b/openwrt/target/linux/rb532-2.6/patches/100-rb5xx_support.patch
index af8bf12d41..f846c78c2b 100644
--- a/openwrt/target/linux/rb532-2.6/patches/100-rb5xx_support.patch
+++ b/openwrt/target/linux/rb532-2.6/patches/100-rb5xx_support.patch
@@ -1773,7 +1773,7 @@ diff -urN linux.old/arch/mips/rb500/time.c linux.dev/arch/mips/rb500/time.c
+
diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/devices/block2mtd.c
--- linux.old/drivers/mtd/devices/block2mtd.c 2006-10-11 21:55:59.000000000 +0200
-+++ linux.dev/drivers/mtd/devices/block2mtd.c 2006-10-11 21:57:34.000000000 +0200
++++ linux.dev/drivers/mtd/devices/block2mtd.c 2006-10-11 22:24:51.000000000 +0200
@@ -26,7 +26,6 @@
#define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
#define INFO(fmt, args...) printk(KERN_INFO "block2mtd: " fmt "\n" , ## args)
@@ -1827,12 +1827,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
dev->mtd.erasesize >> 10, dev->mtd.erasesize);
return dev;
-@@ -425,11 +425,11 @@
- #endif
-
-
--static int block2mtd_setup2(const char *val)
-+int block2mtd_setup2(const char *val)
+@@ -429,7 +429,7 @@
{
char buf[80 + 12]; /* 80 for device, 12 for erase size */
char *str = buf;
@@ -1850,7 +1845,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
token[i] = strsep(&str, ",");
if (str)
-@@ -461,7 +461,7 @@
+@@ -461,13 +461,13 @@
}
}
@@ -1859,6 +1854,13 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
return 0;
}
+
+
+-static int block2mtd_setup(const char *val, struct kernel_param *kp)
++int block2mtd_setup(const char *val, struct kernel_param *kp)
+ {
+ #ifdef MODULE
+ return block2mtd_setup2(val);
@@ -496,6 +496,7 @@
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);