diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:59:38 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:59:38 -0500 |
commit | 6fc88198961141c2d9d34cde0855fb2e85ea3382 (patch) | |
tree | 8b8919de6277e77763b7a584fe2b2867c96cefd0 /drivers/mtd/maps/physmap.c | |
parent | 5f3fdeb6242d84126e4bd45ac9e2246833fe8352 (diff) | |
parent | 5666c0947ede0432ba5148570aa66ffb9febff5b (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/mtd/maps/physmap.c')
-rw-r--r-- | drivers/mtd/maps/physmap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 9ee760f97bc6..f49ebc3c4606 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: physmap.c,v 1.38 2005/11/07 11:14:28 gleixner Exp $ | 2 | * $Id: physmap.c,v 1.39 2005/11/29 14:49:36 gleixner Exp $ |
3 | * | 3 | * |
4 | * Normal mappings of chips in physical memory | 4 | * Normal mappings of chips in physical memory |
5 | * | 5 | * |
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/mtd/map.h> | 19 | #include <linux/mtd/map.h> |
20 | #include <linux/config.h> | 20 | #include <linux/config.h> |
21 | #include <linux/mtd/partitions.h> | 21 | #include <linux/mtd/partitions.h> |
22 | #include <linux/mtd/physmap.h> | ||
22 | 23 | ||
23 | static struct mtd_info *mymtd; | 24 | static struct mtd_info *mymtd; |
24 | 25 | ||