git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
include
/
linux
/
tty.h
diff --git
a/include/linux/tty.h
b/include/linux/tty.h
index
65321f9
..
f717f08
100644
(file)
--- a/
include/linux/tty.h
+++ b/
include/linux/tty.h
@@
-53,7
+53,7
@@
struct tty_buffer {
};
struct tty_bufhead {
- struct
work_struct
work;
+ struct
delayed_work
work;
struct semaphore pty_sem;
spinlock_t lock;
struct tty_buffer *head; /* Queue head */