diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-05 04:42:39 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-05 04:42:39 +0100 |
| commit | 752c58a471c108d64da1676b2925dfbd83eb177e (patch) | |
| tree | fbffa0d7c54cd812950dffc16d642c9d449f4faf /arch/um/drivers/pty.c | |
| parent | Input: drivers/char/keyboard.c - small cleanup in k_cur() (diff) | |
| parent | Make sure "user->sigpending" count is in sync (diff) | |
| download | linux-752c58a471c108d64da1676b2925dfbd83eb177e.tar.xz linux-752c58a471c108d64da1676b2925dfbd83eb177e.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/um/drivers/pty.c')
| -rw-r--r-- | arch/um/drivers/pty.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c index abec620e8380..829a5eca8c07 100644 --- a/arch/um/drivers/pty.c +++ b/arch/um/drivers/pty.c @@ -13,6 +13,7 @@ #include "user_util.h" #include "kern_util.h" #include "os.h" +#include "um_malloc.h" struct pty_chan { void (*announce)(char *dev_name, int dev); |