projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[powerpc.git]
/
drivers
/
mtd
/
mtdconcat.c
diff --git
a/drivers/mtd/mtdconcat.c
b/drivers/mtd/mtdconcat.c
index
eaaafb1
..
b1bf8c4
100644
(file)
--- a/
drivers/mtd/mtdconcat.c
+++ b/
drivers/mtd/mtdconcat.c
@@
-7,7
+7,7
@@
*
* This code is GPL
*
*
* This code is GPL
*
- * $Id: mtdconcat.c,v 1.1
0 2005/11/06 10:04:37
gleixner Exp $
+ * $Id: mtdconcat.c,v 1.1
1 2005/11/07 11:14:20
gleixner Exp $
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
@@
-44,7
+44,7
@@
struct mtd_concat {
*/
#define CONCAT(x) ((struct mtd_concat *)(x))
*/
#define CONCAT(x) ((struct mtd_concat *)(x))
-/*
+/*
* MTD methods which look up the relevant subdevice, translate the
* effective address and pass through to the subdevice.
*/
* MTD methods which look up the relevant subdevice, translate the
* effective address and pass through to the subdevice.
*/
@@
-878,7
+878,7
@@
struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c
return &concat->mtd;
}
return &concat->mtd;
}
-/*
+/*
* This function destroys an MTD object obtained from concat_mtd_devs()
*/
* This function destroys an MTD object obtained from concat_mtd_devs()
*/