diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /arch/um/drivers/chan_user.c | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'arch/um/drivers/chan_user.c')
| -rw-r--r-- | arch/um/drivers/chan_user.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index 025764089ac8..cfeb3f4a44af 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <termios.h> | 11 | #include <termios.h> |
| 12 | #include <sys/ioctl.h> | 12 | #include <sys/ioctl.h> |
| 13 | #include "chan_user.h" | 13 | #include "chan_user.h" |
| 14 | #include "kern_constants.h" | ||
| 14 | #include "os.h" | 15 | #include "os.h" |
| 15 | #include "um_malloc.h" | 16 | #include "um_malloc.h" |
| 16 | #include "user.h" | 17 | #include "user.h" |