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
/
ceiva.c
diff --git
a/drivers/mtd/maps/ceiva.c
b/drivers/mtd/maps/ceiva.c
index
8475505
..
5a95ab3
100644
(file)
--- a/
drivers/mtd/maps/ceiva.c
+++ b/
drivers/mtd/maps/ceiva.c
@@
-11,7
+11,7
@@
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
*
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
*
- * $Id: ceiva.c,v 1.1
0 2004/07/12 21:59:43 dwmw2
Exp $
+ * $Id: ceiva.c,v 1.1
1 2004/09/16 23:27:12 gleixner
Exp $
*/
#include <linux/config.h>
*/
#include <linux/config.h>
@@
-20,6
+20,7
@@
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
@@
-150,7
+151,7
@@
static int __init clps_setup_mtd(struct clps_info *clps, int nr, struct mtd_info
break;
}
break;
}
- clps[i].map->virt = (
unsigned long
)clps[i].vbase;
+ clps[i].map->virt = (
void __iomem *
)clps[i].vbase;
clps[i].map->bankwidth = clps[i].width;
clps[i].map->size = clps[i].size;
clps[i].map->bankwidth = clps[i].width;
clps[i].map->size = clps[i].size;
@@
-312,8
+313,7
@@
static void __init clps_locate_partitions(struct mtd_info *mtd)
static void __exit clps_destroy_partitions(void)
{
static void __exit clps_destroy_partitions(void)
{
- if (parsed_parts)
- kfree(parsed_parts);
+ kfree(parsed_parts);
}
static struct mtd_info *mymtd;
}
static struct mtd_info *mymtd;