git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
mpc1211.c
diff --git
a/drivers/mtd/maps/mpc1211.c
b/drivers/mtd/maps/mpc1211.c
index
cc55200
..
45a00fa
100644
(file)
--- a/
drivers/mtd/maps/mpc1211.c
+++ b/
drivers/mtd/maps/mpc1211.c
@@
-1,7
+1,7
@@
/*
* Flash on MPC-1211
*
/*
* Flash on MPC-1211
*
- * $Id: mpc1211.c,v 1.
3 2004/07/14 17:45:40 dwmw2
Exp $
+ * $Id: mpc1211.c,v 1.
4 2004/09/16 23:27:13 gleixner
Exp $
*
* (C) 2002 Interface, Saito.K & Jeanne
*
*
* (C) 2002 Interface, Saito.K & Jeanne
*
@@
-15,7
+15,6
@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
-#include <linux/config.h>
static struct mtd_info *flash_mtd;
static struct mtd_partition *parsed_parts;
static struct mtd_info *flash_mtd;
static struct mtd_partition *parsed_parts;
@@
-44,7
+43,7
@@
static int __init init_mpc1211_maps(void)
int nr_parts;
mpc1211_flash_map.phys = 0;
int nr_parts;
mpc1211_flash_map.phys = 0;
- mpc1211_flash_map.virt = P2SEGADDR(0);
+ mpc1211_flash_map.virt =
(void __iomem *)
P2SEGADDR(0);
simple_map_init(&mpc1211_flash_map);
simple_map_init(&mpc1211_flash_map);