another compile fix
SVN-Revision: 5052
This commit is contained in:
parent
851f1d7713
commit
2b9c37f961
1 changed files with 10 additions and 8 deletions
|
@ -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
|
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.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 @@
|
@@ -26,7 +26,6 @@
|
||||||
#define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
|
#define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
|
||||||
#define INFO(fmt, args...) printk(KERN_INFO "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);
|
dev->mtd.erasesize >> 10, dev->mtd.erasesize);
|
||||||
return dev;
|
return dev;
|
||||||
|
|
||||||
@@ -425,11 +425,11 @@
|
@@ -429,7 +429,7 @@
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
-static int block2mtd_setup2(const char *val)
|
|
||||||
+int block2mtd_setup2(const char *val)
|
|
||||||
{
|
{
|
||||||
char buf[80 + 12]; /* 80 for device, 12 for erase size */
|
char buf[80 + 12]; /* 80 for device, 12 for erase size */
|
||||||
char *str = buf;
|
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, ",");
|
token[i] = strsep(&str, ",");
|
||||||
|
|
||||||
if (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;
|
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 @@
|
@@ -496,6 +496,7 @@
|
||||||
|
|
||||||
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
|
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
|
||||||
|
|
Loading…
Reference in a new issue