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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
physmap.c
diff --git
a/drivers/mtd/maps/physmap.c
b/drivers/mtd/maps/physmap.c
index
b853670
..
f49ebc3
100644
(file)
--- a/
drivers/mtd/maps/physmap.c
+++ b/
drivers/mtd/maps/physmap.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: physmap.c,v 1.3
7 2004/11/28 09:40:40 dwmw2
Exp $
+ * $Id: physmap.c,v 1.3
9 2005/11/29 14:49:36 gleixner
Exp $
*
* Normal mappings of chips in physical memory
*
*
* Normal mappings of chips in physical memory
*
@@
-19,6
+19,7
@@
#include <linux/mtd/map.h>
#include <linux/config.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/map.h>
#include <linux/config.h>
#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
static struct mtd_info *mymtd;
static struct mtd_info *mymtd;
@@
-69,7
+70,7
@@
static int __init init_physmap(void)
mymtd->owner = THIS_MODULE;
#ifdef CONFIG_MTD_PARTITIONS
mymtd->owner = THIS_MODULE;
#ifdef CONFIG_MTD_PARTITIONS
- mtd_parts_nb = parse_mtd_partitions(mymtd, part_probes,
+ mtd_parts_nb = parse_mtd_partitions(mymtd, part_probes,
&mtd_parts, 0);
if (mtd_parts_nb > 0)
&mtd_parts, 0);
if (mtd_parts_nb > 0)
@@
-78,9
+79,9
@@
static int __init init_physmap(void)
return 0;
}
return 0;
}
- if (num_physmap_partitions != 0)
+ if (num_physmap_partitions != 0)
{
{
- printk(KERN_NOTICE
+ printk(KERN_NOTICE
"Using physmap partition definition\n");
add_mtd_partitions (mymtd, physmap_partitions, num_physmap_partitions);
return 0;
"Using physmap partition definition\n");
add_mtd_partitions (mymtd, physmap_partitions, num_physmap_partitions);
return 0;