diff options
Diffstat (limited to 'drivers/mtd/mtdconcat.c')
-rw-r--r-- | drivers/mtd/mtdconcat.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index f3e65af33a9c..b1bf8c411de7 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c | |||
@@ -7,14 +7,15 @@ | |||
7 | * | 7 | * |
8 | * This code is GPL | 8 | * This code is GPL |
9 | * | 9 | * |
10 | * $Id: mtdconcat.c,v 1.9 2004/06/30 15:17:41 dbrown Exp $ | 10 | * $Id: mtdconcat.c,v 1.11 2005/11/07 11:14:20 gleixner Exp $ |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/module.h> | ||
14 | #include <linux/types.h> | ||
15 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/module.h> | ||
16 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
17 | #include <linux/sched.h> /* TASK_* */ | 16 | #include <linux/sched.h> |
17 | #include <linux/types.h> | ||
18 | |||
18 | #include <linux/mtd/mtd.h> | 19 | #include <linux/mtd/mtd.h> |
19 | #include <linux/mtd/concat.h> | 20 | #include <linux/mtd/concat.h> |
20 | 21 | ||
@@ -43,7 +44,7 @@ struct mtd_concat { | |||
43 | */ | 44 | */ |
44 | #define CONCAT(x) ((struct mtd_concat *)(x)) | 45 | #define CONCAT(x) ((struct mtd_concat *)(x)) |
45 | 46 | ||
46 | /* | 47 | /* |
47 | * MTD methods which look up the relevant subdevice, translate the | 48 | * MTD methods which look up the relevant subdevice, translate the |
48 | * effective address and pass through to the subdevice. | 49 | * effective address and pass through to the subdevice. |
49 | */ | 50 | */ |
@@ -877,7 +878,7 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c | |||
877 | return &concat->mtd; | 878 | return &concat->mtd; |
878 | } | 879 | } |
879 | 880 | ||
880 | /* | 881 | /* |
881 | * This function destroys an MTD object obtained from concat_mtd_devs() | 882 | * This function destroys an MTD object obtained from concat_mtd_devs() |
882 | */ | 883 | */ |
883 | 884 | ||