git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm'
[safe/jmp/linux-2.6]
/
include
/
linux
/
sched.h
diff --git
a/include/linux/sched.h
b/include/linux/sched.h
index
1bc6fae
..
02042e7
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