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]
/
arch
/
ppc
/
platforms
/
ev64360.c
diff --git
a/arch/ppc/platforms/ev64360.c
b/arch/ppc/platforms/ev64360.c
index
b9d844f
..
f87e06f
100644
(file)
--- a/
arch/ppc/platforms/ev64360.c
+++ b/
arch/ppc/platforms/ev64360.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/ev64360.c
- *
* Board setup routines for the Marvell EV-64360-BP Evaluation Board.
*
* Author: Lee Nicks <allinux@gmail.com>
* Board setup routines for the Marvell EV-64360-BP Evaluation Board.
*
* Author: Lee Nicks <allinux@gmail.com>
@@
-13,7
+11,6
@@
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/kdev_t.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/kdev_t.h>
@@
-300,7
+297,7
@@
ev64360_fixup_eth_pdata(struct platform_device *pdev)
}
#endif
}
#endif
-static int
__init
+static int
ev64360_platform_notify(struct device *dev)
{
static struct {
ev64360_platform_notify(struct device *dev)
{
static struct {
@@
-361,13
+358,12
@@
ev64360_setup_mtd(void)
ptbl_entries = 3;
ptbl_entries = 3;
- if ((ptbl = k
m
alloc(ptbl_entries * sizeof(struct mtd_partition),
+ if ((ptbl = k
z
alloc(ptbl_entries * sizeof(struct mtd_partition),
GFP_KERNEL)) == NULL) {
printk(KERN_WARNING "Can't alloc MTD partition table\n");
return -ENOMEM;
}
GFP_KERNEL)) == NULL) {
printk(KERN_WARNING "Can't alloc MTD partition table\n");
return -ENOMEM;
}
- memset(ptbl, 0, ptbl_entries * sizeof(struct mtd_partition));
ptbl[0].name = "reserved";
ptbl[0].offset = 0;
ptbl[0].name = "reserved";
ptbl[0].offset = 0;