git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm'
[sfrench/cifs-2.6.git]
/
include
/
linux
/
sched.h
diff --git
a/include/linux/sched.h
b/include/linux/sched.h
index 1bc6fae0c1351b96ffd7e7f1e88dda544891f73c..02042e7f21965c3e7b4bbf43f8b5e996076f6f4f 100644
(file)
--- a/
include/linux/sched.h
+++ b/
include/linux/sched.h
@@
-674,7
+674,7
@@
struct user_struct {
struct task_group *tg;
#ifdef CONFIG_SYSFS
struct kobject kobj;
- struct
work_struct
work;
+ struct
delayed_work
work;
#endif
#endif