projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge by hand (conflicts between pending drivers and kfree cleanups)
[powerpc.git]
/
lib
/
kobject.c
diff --git
a/lib/kobject.c
b/lib/kobject.c
index
dd0917d
..
a181abe
100644
(file)
--- a/
lib/kobject.c
+++ b/
lib/kobject.c
@@
-14,6
+14,7
@@
#include <linux/string.h>
#include <linux/module.h>
#include <linux/stat.h>
#include <linux/string.h>
#include <linux/module.h>
#include <linux/stat.h>
+#include <linux/slab.h>
/**
* populate_dir - populate directory with attributes.
/**
* populate_dir - populate directory with attributes.
@@
-100,7
+101,7
@@
static void fill_kobj_path(struct kobject *kobj, char *path, int length)
* @kobj: kobject in question, with which to build the path
* @gfp_mask: the allocation type used to allocate the path
*/
* @kobj: kobject in question, with which to build the path
* @gfp_mask: the allocation type used to allocate the path
*/
-char *kobject_get_path(struct kobject *kobj,
in
t gfp_mask)
+char *kobject_get_path(struct kobject *kobj,
gfp_
t gfp_mask)
{
char *path;
int len;
{
char *path;
int len;