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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
ocp.c
diff --git
a/arch/ppc/syslib/ocp.c
b/arch/ppc/syslib/ocp.c
index
2fe28de
..
50c5562
100644
(file)
--- a/
arch/ppc/syslib/ocp.c
+++ b/
arch/ppc/syslib/ocp.c
@@
-36,7
+36,6
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/list.h>
#include <linux/miscdevice.h>
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/miscdevice.h>
#include <linux/slab.h>
@@
-451,10
+450,9
@@
ocp_driver_init(void)
DBG(("ocp: ocp_driver_init()...\n"));
/* Allocate/register primary OCP bus */
DBG(("ocp: ocp_driver_init()...\n"));
/* Allocate/register primary OCP bus */
- ocp_bus = k
m
alloc(sizeof(struct device), GFP_KERNEL);
+ ocp_bus = k
z
alloc(sizeof(struct device), GFP_KERNEL);
if (ocp_bus == NULL)
return 1;
if (ocp_bus == NULL)
return 1;
- memset(ocp_bus, 0, sizeof(struct device));
strcpy(ocp_bus->bus_id, "ocp");
bus_register(&ocp_bus_type);
strcpy(ocp_bus->bus_id, "ocp");
bus_register(&ocp_bus_type);