projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc
[cascardo/linux.git]
/
include
/
linux
/
kobject.h
diff --git
a/include/linux/kobject.h
b/include/linux/kobject.h
index
9229b64
..
668729c
100644
(file)
--- a/
include/linux/kobject.h
+++ b/
include/linux/kobject.h
@@
-25,7
+25,7
@@
#include <linux/kobject_ns.h>
#include <linux/kernel.h>
#include <linux/wait.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#define UEVENT_HELPER_PATH_LEN 256
#define UEVENT_NUM_ENVP 32 /* number of env pointers */