diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 | 
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 | 
| commit | 2f67bdb23d74a6c6fd4f98f64239c5c34d1833cc (patch) | |
| tree | fe533abe3e7c400848647b95e4806f5125c654c3 /arch/um/drivers/xterm.c | |
| parent | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/um/drivers/xterm.c')
| -rw-r--r-- | arch/um/drivers/xterm.c | 1 | 
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c index 90e0e5ff451e..b530f1a6540d 100644 --- a/arch/um/drivers/xterm.c +++ b/arch/um/drivers/xterm.c  | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <sys/socket.h> | 14 | #include <sys/socket.h> | 
| 15 | #include "kern_util.h" | 15 | #include "kern_util.h" | 
| 16 | #include "chan_user.h" | 16 | #include "chan_user.h" | 
| 17 | #include "helper.h" | ||
| 18 | #include "user_util.h" | 17 | #include "user_util.h" | 
| 19 | #include "user.h" | 18 | #include "user.h" | 
| 20 | #include "os.h" | 19 | #include "os.h" | 
